Auto merge of #90361 - Mark-Simulacrum:always-verify, r=michaelwoerister

[rust.git] / src / tools / rustfmt / src / syntux / session.rs

diff --git a/src/tools/rustfmt/src/syntux/session.rs b/src/tools/rustfmt/src/syntux/session.rs
index 870f0acfe395c527bd0e0a6fee9c833073e766ba..cdb4893d443b9b381cde8e4c1d284aee5154ddd4 100644 (file)
--- a/src/tools/rustfmt/src/syntux/session.rs
+++ b/src/tools/rustfmt/src/syntux/session.rs
@@ -164,7 +164,7 @@ pub(crate) fn is_file_parsed(&self, path: &Path) -> bool {
     }
 
     pub(crate) fn ignore_file(&self, path: &FileName) -> bool {
-        self.ignore_path_set.as_ref().is_match(&path)
+        self.ignore_path_set.as_ref().is_match(path)
     }
 
     pub(crate) fn set_silent_emitter(&mut self) {
@@ -175,6 +175,12 @@ pub(crate) fn span_to_filename(&self, span: Span) -> FileName {
         self.parse_sess.source_map().span_to_filename(span).into()
     }
 
+    pub(crate) fn span_to_file_contents(&self, span: Span) -> Lrc<rustc_span::SourceFile> {
+        self.parse_sess
+            .source_map()
+            .lookup_source_file(span.data().lo)
+    }
+
     pub(crate) fn span_to_first_line_string(&self, span: Span) -> String {
         let file_lines = self.parse_sess.source_map().span_to_lines(span).ok();
 
@@ -311,6 +317,7 @@ fn build_diagnostic(level: DiagnosticLevel, span: Option<MultiSpan>) -> Diagnost
                 suggestions: vec![],
                 span: span.unwrap_or_else(MultiSpan::new),
                 sort_span: DUMMY_SP,
+                is_lint: false,
             }
         }