Modify SubtypeFormat

Author: moatom

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

@@ -7,7 +7,6 @@ pub mod on_unimplemented_format;
 mod overflow;
 pub mod suggestions;
 
-use std::cmp::Reverse;
 use std::{fmt, iter};
 
 use rustc_data_structures::fx::{FxIndexMap, FxIndexSet};
@@ -139,7 +138,7 @@ pub enum DefIdOrName {
 
 #[derive(Debug, PartialEq, Eq, PartialOrd, Ord)]
 enum ErrorSortKey {
-    SubtypeFormat(Reverse<(usize, usize)>),
+    SubtypeFormat(usize, usize),
     OtherKind,
     SizedTrait,
     MetaSizedTrait,
@@ -199,7 +198,7 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
                             || self.tcx.is_diagnostic_item(sym::format_args_macro, def_id))
                         && span_file.src_hash == source_file.src_hash =>
                 {
-                    ErrorSortKey::SubtypeFormat(Reverse((row, col)))
+                    ErrorSortKey::SubtypeFormat(row, col)
                 }
                 _ if maybe_sizedness_did == self.tcx.lang_items().sized_trait() => ErrorSortKey::SizedTrait,
                 _ if maybe_sizedness_did == self.tcx.lang_items().meta_sized_trait() => ErrorSortKey::MetaSizedTrait,

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

@@ -24,8 +24,8 @@ fn check_unformatted() {
 {a}
 {a:?}",
         [],
+        //~^ ERROR type annotations needed
  [],
- //~^ ERROR type annotations needed
 a = 1 + 1);
 }
 

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

@@ -15,26 +15,26 @@ 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[E0282]: type annotations needed
-  --> $DIR/span-format_args-issue-140578.rs:12:39
+  --> $DIR/span-format_args-issue-140578.rs:12:35
    |
 LL |   println!("{:?} {:?} {a} {a:?}", [], [], a = 1 + 1);
-   |                                       ^^ cannot infer type
+   |                                   ^^ 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
+  --> $DIR/span-format_args-issue-140578.rs:17:41
    |
 LL |   println!("{:?} {:?} {a} {a:?} {b:?}", [], [], a = 1 + 1, b = []);
-   |                                                                ^^ cannot infer type
+   |                                         ^^ 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
+  --> $DIR/span-format_args-issue-140578.rs:26:9
    |
-LL |  [],
-   |  ^^ cannot infer type
+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)