Fix SubtypeFormat sorting for unformmated code

Author: moatom

compiler/rustc_trait_selection/src/error_reporting/traits/mod.rs

@@ -139,7 +139,7 @@ pub enum DefIdOrName {
 
 #[derive(Debug, PartialEq, Eq, PartialOrd, Ord)]
 enum ErrorSortKey {
-    SubtypeFormat(Reverse<usize>),
+    SubtypeFormat(Reverse<(usize, usize)>),
     OtherKind,
     ClauseTraitSized,
     Coerce,
@@ -175,18 +175,21 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
         errors.sort_by_key(|e| {
             let span = e.obligation.cause.span;
             let outer_expn_data = span.ctxt().outer_expn_data();
+            let source_span = outer_expn_data.call_site.source_callsite();
+            let source_map = self.tcx.sess.source_map();
 
             match e.obligation.predicate.kind().skip_binder() {
                 ty::PredicateKind::Subtype(_)
                     if let Some(def_id) = outer_expn_data.macro_def_id
+                        && let (Some(span_file), row, col, ..) =
+                            source_map.span_to_location_info(span)
+                        && let (Some(source_file), ..) =
+                            source_map.span_to_location_info(source_span)
                         && (self.tcx.is_diagnostic_item(sym::format_args_nl_macro, def_id)
                             || self.tcx.is_diagnostic_item(sym::format_args_macro, def_id))
-                        && self.is_source_span(span) =>
+                        && span_file.src_hash == source_file.src_hash =>
                 {
-                    let source_map = self.tcx.sess.source_map();
-                    let (_, _, lo_col, _, _) = source_map.span_to_location_info(span);
-
-                    ErrorSortKey::SubtypeFormat(Reverse(lo_col))
+                    ErrorSortKey::SubtypeFormat(Reverse((row, col)))
                 }
                 ty::PredicateKind::Clause(ty::ClauseKind::Trait(pred))
                     if self.tcx.is_lang_item(pred.def_id(), LangItem::Sized) =>
@@ -278,21 +281,6 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
         reported.unwrap_or_else(|| self.dcx().delayed_bug("failed to report fulfillment errors"))
     }
 
-    fn is_source_span(&self, span: Span) -> bool {
-        let source_map = self.tcx.sess.source_map();
-
-        let outer_expn_data = span.ctxt().outer_expn_data();
-        let outer_callsite = outer_expn_data.call_site.source_callsite();
-
-        let span_info = source_map.span_to_location_info(span);
-        let outer_info = source_map.span_to_location_info(outer_callsite);
-
-        match (span_info, outer_info) {
-            ((Some(sf1), _, _, _, _), (Some(sf2), _, _, _, _)) => sf1.src_hash == sf2.src_hash,
-            _ => false,
-        }
-    }
-
     #[instrument(skip(self), level = "debug")]
     fn report_fulfillment_error(&self, error: &FulfillmentError<'tcx>) -> ErrorGuaranteed {
         let mut error = FulfillmentError {

tests/ui/errors/span-format_args-issue-140578.rs

@@ -8,4 +8,25 @@ fn check_format_args_nl() {
   //~^ ERROR type annotations needed
 }
 
+fn check_multi1() {
+  println!("{:?} {:?} {a} {a:?}", [], [], a = 1 + 1);
+  //~^ ERROR type annotations needed
+}
+
+fn check_multi2() {
+  println!("{:?} {:?} {a} {a:?} {b:?}", [], [], a = 1 + 1, b = []);
+  //~^ ERROR type annotations needed
+}
+
+fn check_unformatted() {
+  println!("
+  {:?} {:?}
+{a}
+{a:?}",
+        [],
+ [],
+ //~^ ERROR type annotations needed
+a = 1 + 1);
+}
+
 fn main() {}

tests/ui/errors/span-format_args-issue-140578.stderr

@@ -14,6 +14,30 @@ LL |   println!("{:?} {a} {a:?}", [], a = 1 + 1);
    |
    = note: this error originates in the macro `$crate::format_args_nl` which comes from the expansion of the macro `println` (in Nightly builds, run with -Z macro-backtrace for more info)
 
-error: aborting due to 2 previous errors
+error[E0282]: type annotations needed
+  --> $DIR/span-format_args-issue-140578.rs:12:39
+   |
+LL |   println!("{:?} {:?} {a} {a:?}", [], [], a = 1 + 1);
+   |                                       ^^ cannot infer type
+   |
+   = note: this error originates in the macro `$crate::format_args_nl` which comes from the expansion of the macro `println` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error[E0282]: type annotations needed
+  --> $DIR/span-format_args-issue-140578.rs:17:64
+   |
+LL |   println!("{:?} {:?} {a} {a:?} {b:?}", [], [], a = 1 + 1, b = []);
+   |                                                                ^^ cannot infer type
+   |
+   = note: this error originates in the macro `$crate::format_args_nl` which comes from the expansion of the macro `println` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error[E0282]: type annotations needed
+  --> $DIR/span-format_args-issue-140578.rs:27:2
+   |
+LL |  [],
+   |  ^^ cannot infer type
+   |
+   = note: this error originates in the macro `$crate::format_args_nl` which comes from the expansion of the macro `println` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: aborting due to 5 previous errors
 
 For more information about this error, try `rustc --explain E0282`.