Auto merge of #7794 - ThibsG:FieldReassignDefault6312, r=llogiq

[rust.git] / clippy_lints / src / module_style.rs

diff --git a/clippy_lints/src/module_style.rs b/clippy_lints/src/module_style.rs
index 73e93cf5a3ec5c47fb84def1c68329b0bde51e8e..f351d0098b7509cf6abdddfef53c21a29cc7a663 100644 (file)
--- a/clippy_lints/src/module_style.rs
+++ b/clippy_lints/src/module_style.rs
@@ -80,7 +80,7 @@ fn check_crate(&mut self, cx: &EarlyContext<'_>, _: &ast::Crate) {
 
         let files = cx.sess.source_map().files();
 
-        let trim_to_src = if let RealFileName::LocalPath(p) = &cx.sess.working_dir {
+        let trim_to_src = if let RealFileName::LocalPath(p) = &cx.sess.opts.working_dir {
             p.to_string_lossy()
         } else {
             return;
@@ -120,7 +120,7 @@ fn check_crate(&mut self, cx: &EarlyContext<'_>, _: &ast::Crate) {
                     correct.push("mod.rs");
                     cx.struct_span_lint(
                         SELF_NAMED_MODULE_FILES,
-                        Span::new(file.start_pos, file.start_pos, SyntaxContext::root()),
+                        Span::new(file.start_pos, file.start_pos, SyntaxContext::root(), None),
                         |build| {
                             let mut lint =
                                 build.build(&format!("`mod.rs` files are required, found `{}`", path.display()));
@@ -167,7 +167,7 @@ fn check_self_named_mod_exists(cx: &EarlyContext<'_>, path: &Path, file: &Source
 
         cx.struct_span_lint(
             MOD_MODULE_FILES,
-            Span::new(file.start_pos, file.start_pos, SyntaxContext::root()),
+            Span::new(file.start_pos, file.start_pos, SyntaxContext::root(), None),
             |build| {
                 let mut lint = build.build(&format!("`mod.rs` files are not allowed, found `{}`", path.display()));
                 lint.help(&format!("move `{}` to `{}`", path.display(), mod_file.display(),));