Skip to content

Commit ae92e64

Browse files
committed
Adapt Clippy to the overhaul filename handling
1 parent 19070a4 commit ae92e64

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/tools/clippy/clippy_lints/src/module_style.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ pub struct ModStyle {
8181

8282
impl EarlyLintPass for ModStyle {
8383
fn check_crate(&mut self, cx: &EarlyContext<'_>, _: &ast::Crate) {
84-
self.working_dir = cx.sess().opts.working_dir.local_path().map(Path::to_path_buf);
84+
self.working_dir = cx.sess().source_map().working_dir().local_path().map(Path::to_path_buf);
8585
}
8686

8787
fn check_item(&mut self, cx: &EarlyContext<'_>, item: &ast::Item) {

src/tools/clippy/clippy_utils/src/source.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use rustc_middle::ty::TyCtxt;
1313
use rustc_session::Session;
1414
use rustc_span::source_map::{SourceMap, original_sp};
1515
use rustc_span::{
16-
BytePos, DUMMY_SP, DesugaringKind, FileNameDisplayPreference, Pos, RelativeBytePos, SourceFile, SourceFileAndLine,
16+
BytePos, DUMMY_SP, DesugaringKind, Pos, RelativeBytePos, SourceFile, SourceFileAndLine,
1717
Span, SpanData, SyntaxContext, hygiene,
1818
};
1919
use std::borrow::Cow;
@@ -268,7 +268,7 @@ fn map_range(
268268
debug_assert!(
269269
range.start <= text.len() && range.end <= text.len(),
270270
"Range `{range:?}` is outside the source file (file `{}`, length `{}`)",
271-
src.sf.name.display(FileNameDisplayPreference::Local),
271+
src.sf.name.prefer_local_unconditionally(),
272272
text.len(),
273273
);
274274
debug_assert!(range.start <= range.end, "Range `{range:?}` has overlapping bounds");

0 commit comments

Comments
 (0)