Fix sorting logic for ErrorSortKey::SubtypeFormat

Author: moatom

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

@@ -22,7 +22,7 @@ use rustc_infer::traits::{
 };
 use rustc_middle::ty::print::{PrintTraitRefExt as _, with_no_trimmed_paths};
 use rustc_middle::ty::{self, Ty, TyCtxt};
-use rustc_span::{ErrorGuaranteed, ExpnKind, Span};
+use rustc_span::{ErrorGuaranteed, ExpnKind, Span, sym};
 use tracing::{info, instrument};
 
 pub use self::overflow::*;
@@ -179,24 +179,14 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
             match e.obligation.predicate.kind().skip_binder() {
                 ty::PredicateKind::Subtype(_)
                     if let Some(def_id) = outer_expn_data.macro_def_id
-                        && (self
-                            .tcx
-                            .is_diagnostic_item(rustc_span::sym::format_args_nl_macro, def_id)
-                            || self.tcx.is_diagnostic_item(
-                                rustc_span::sym::format_args_macro,
-                                def_id,
-                            )) =>
+                        && (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) =>
                 {
-                    let sm = self.tcx.sess.source_map();
-                    let lc = sm.span_to_location_info(span);
-
-                    if sm.span_to_embeddable_string(span)
-                        == sm.span_to_embeddable_string(outer_expn_data.call_site)
-                    {
-                        ErrorSortKey::OtherKind
-                    } else {
-                        ErrorSortKey::SubtypeFormat(Reverse(lc.2))
-                    }
+                    let source_map = self.tcx.sess.source_map();
+                    let (_, _, lo_col, _, _) = source_map.span_to_location_info(span);
+
+                    ErrorSortKey::SubtypeFormat(Reverse(lo_col))
                 }
                 ty::PredicateKind::Clause(ty::ClauseKind::Trait(pred))
                     if self.tcx.is_lang_item(pred.def_id(), LangItem::Sized) =>
@@ -288,6 +278,21 @@ 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 {