Accurate use rename suggestion span

estebank · estebank · commit 119e5d568e29 · 2024-07-10T01:49:11.000Z
diff --git a/compiler/rustc_resolve/src/diagnostics.rs b/compiler/rustc_resolve/src/diagnostics.rs
@@ -371,6 +371,7 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
         };
 
         let mut suggestion = None;
+        let mut span = binding_span;
         match import.kind {
             ImportKind::Single { type_ns_only: true, .. } => {
                 suggestion = Some(format!("self as {suggested_name}"))
@@ -381,12 +382,10 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
                 {
                     if let Ok(snippet) = self.tcx.sess.source_map().span_to_snippet(binding_span) {
                         if pos <= snippet.len() {
-                            suggestion = Some(format!(
-                                "{} as {}{}",
-                                &snippet[..pos],
-                                suggested_name,
-                                if snippet.ends_with(';') { ";" } else { "" }
-                            ))
+                            span = binding_span
+                                .with_hi(binding_span.lo() + BytePos(pos as u32))
+                                .shrink_to_hi();
+                            suggestion = Some(format!(" as {}", suggested_name,))
                         }
                     }
                 }
@@ -402,9 +401,9 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
         }
 
         if let Some(suggestion) = suggestion {
-            err.subdiagnostic(ChangeImportBindingSuggestion { span: binding_span, suggestion });
+            err.subdiagnostic(ChangeImportBindingSuggestion { span, suggestion });
         } else {
-            err.subdiagnostic(ChangeImportBinding { span: binding_span });
+            err.subdiagnostic(ChangeImportBinding { span });
         }
     }
 
diff --git a/tests/ui/blind/blind-item-block-item-shadow.stderr b/tests/ui/blind/blind-item-block-item-shadow.stderr
@@ -9,9 +9,8 @@ LL |         use foo::Bar;
    = note: `Bar` must be defined only once in the type namespace of this block
 help: you can use `as` to change the binding name of the import
    |
-LL -         use foo::Bar;
-LL +         use foo::Bar as OtherBar;
-   |
+LL |         use foo::Bar as OtherBar;
+   |                      +++++++++++
 
 error: aborting due to 1 previous error
 
diff --git a/tests/ui/blind/blind-item-item-shadow.stderr b/tests/ui/blind/blind-item-item-shadow.stderr
@@ -10,9 +10,8 @@ LL | use foo::foo;
    = note: `foo` must be defined only once in the type namespace of this module
 help: you can use `as` to change the binding name of the import
    |
-LL - use foo::foo;
-LL + use foo::foo as other_foo;
-   |
+LL | use foo::foo as other_foo;
+   |              ++++++++++++
 
 error: aborting due to 1 previous error
 
diff --git a/tests/ui/duplicate/duplicate-check-macro-exports.stderr b/tests/ui/duplicate/duplicate-check-macro-exports.stderr
@@ -10,9 +10,8 @@ LL | macro_rules! panic { () => {} }
    = note: `panic` must be defined only once in the macro namespace of this module
 help: you can use `as` to change the binding name of the import
    |
-LL - pub use std::panic;
-LL + pub use std::panic as other_panic;
-   |
+LL | pub use std::panic as other_panic;
+   |                    ++++++++++++++
 
 error: aborting due to 1 previous error
 
diff --git a/tests/ui/error-codes/E0252.stderr b/tests/ui/error-codes/E0252.stderr
@@ -9,9 +9,8 @@ LL | use bar::baz;
    = note: `baz` must be defined only once in the type namespace of this module
 help: you can use `as` to change the binding name of the import
    |
-LL - use bar::baz;
-LL + use bar::baz as other_baz;
-   |
+LL | use bar::baz as other_baz;
+   |              ++++++++++++
 
 error: aborting due to 1 previous error
 
diff --git a/tests/ui/error-codes/E0254.stderr b/tests/ui/error-codes/E0254.stderr
@@ -10,9 +10,8 @@ LL | use foo::alloc;
    = note: `alloc` must be defined only once in the type namespace of this module
 help: you can use `as` to change the binding name of the import
    |
-LL - use foo::alloc;
-LL + use foo::alloc as other_alloc;
-   |
+LL | use foo::alloc as other_alloc;
+   |                ++++++++++++++
 
 error: aborting due to 1 previous error
 
diff --git a/tests/ui/error-codes/E0255.stderr b/tests/ui/error-codes/E0255.stderr
@@ -10,9 +10,8 @@ LL | fn foo() {}
    = note: `foo` must be defined only once in the value namespace of this module
 help: you can use `as` to change the binding name of the import
    |
-LL - use bar::foo;
-LL + use bar::foo as other_foo;
-   |
+LL | use bar::foo as other_foo;
+   |              ++++++++++++
 
 error: aborting due to 1 previous error
 
diff --git a/tests/ui/imports/double-import.stderr b/tests/ui/imports/double-import.stderr
@@ -9,9 +9,8 @@ LL | use sub2::foo;
    = note: `foo` must be defined only once in the value namespace of this module
 help: you can use `as` to change the binding name of the import
    |
-LL - use sub2::foo;
-LL + use sub2::foo as other_foo;
-   |
+LL | use sub2::foo as other_foo;
+   |               ++++++++++++
 
 error: aborting due to 1 previous error
 
diff --git a/tests/ui/imports/issue-19498.stderr b/tests/ui/imports/issue-19498.stderr
@@ -10,9 +10,8 @@ LL | mod A {}
    = note: `A` must be defined only once in the type namespace of this module
 help: you can use `as` to change the binding name of the import
    |
-LL - use self::A;
-LL + use self::A as OtherA;
-   |
+LL | use self::A as OtherA;
+   |             +++++++++
 
 error[E0255]: the name `B` is defined multiple times
   --> $DIR/issue-19498.rs:5:1
@@ -26,9 +25,8 @@ LL | pub mod B {}
    = note: `B` must be defined only once in the type namespace of this module
 help: you can use `as` to change the binding name of the import
    |
-LL - use self::B;
-LL + use self::B as OtherB;
-   |
+LL | use self::B as OtherB;
+   |             +++++++++
 
 error[E0255]: the name `D` is defined multiple times
   --> $DIR/issue-19498.rs:9:5
@@ -41,9 +39,8 @@ LL |     mod D {}
    = note: `D` must be defined only once in the type namespace of this module
 help: you can use `as` to change the binding name of the import
    |
-LL -     use C::D;
-LL +     use C::D as OtherD;
-   |
+LL |     use C::D as OtherD;
+   |              +++++++++
 
 error: aborting due to 3 previous errors
 
diff --git a/tests/ui/imports/issue-24081.stderr b/tests/ui/imports/issue-24081.stderr
@@ -10,9 +10,8 @@ LL | type Add = bool;
    = note: `Add` must be defined only once in the type namespace of this module
 help: you can use `as` to change the binding name of the import
    |
-LL - use std::ops::Add;
-LL + use std::ops::Add as OtherAdd;
-   |
+LL | use std::ops::Add as OtherAdd;
+   |                   +++++++++++
 
 error[E0255]: the name `Sub` is defined multiple times
   --> $DIR/issue-24081.rs:9:1
@@ -26,9 +25,8 @@ LL | struct Sub { x: f32 }
    = note: `Sub` must be defined only once in the type namespace of this module
 help: you can use `as` to change the binding name of the import
    |
-LL - use std::ops::Sub;
-LL + use std::ops::Sub as OtherSub;
-   |
+LL | use std::ops::Sub as OtherSub;
+   |                   +++++++++++
 
 error[E0255]: the name `Mul` is defined multiple times
   --> $DIR/issue-24081.rs:11:1
@@ -42,9 +40,8 @@ LL | enum Mul { A, B }
    = note: `Mul` must be defined only once in the type namespace of this module
 help: you can use `as` to change the binding name of the import
    |
-LL - use std::ops::Mul;
-LL + use std::ops::Mul as OtherMul;
-   |
+LL | use std::ops::Mul as OtherMul;
+   |                   +++++++++++
 
 error[E0255]: the name `Div` is defined multiple times
   --> $DIR/issue-24081.rs:13:1
@@ -58,9 +55,8 @@ LL | mod Div { }
    = note: `Div` must be defined only once in the type namespace of this module
 help: you can use `as` to change the binding name of the import
    |
-LL - use std::ops::Div;
-LL + use std::ops::Div as OtherDiv;
-   |
+LL | use std::ops::Div as OtherDiv;
+   |                   +++++++++++
 
 error[E0255]: the name `Rem` is defined multiple times
   --> $DIR/issue-24081.rs:15:1
@@ -74,9 +70,8 @@ LL | trait Rem {  }
    = note: `Rem` must be defined only once in the type namespace of this module
 help: you can use `as` to change the binding name of the import
    |
-LL - use std::ops::Rem;
-LL + use std::ops::Rem as OtherRem;
-   |
+LL | use std::ops::Rem as OtherRem;
+   |                   +++++++++++
 
 error: aborting due to 5 previous errors
 
diff --git a/tests/ui/imports/issue-25396.stderr b/tests/ui/imports/issue-25396.stderr
@@ -9,9 +9,8 @@ LL | use bar::baz;
    = note: `baz` must be defined only once in the type namespace of this module
 help: you can use `as` to change the binding name of the import
    |
-LL - use bar::baz;
-LL + use bar::baz as other_baz;
-   |
+LL | use bar::baz as other_baz;
+   |              ++++++++++++
 
 error[E0252]: the name `Quux` is defined multiple times
   --> $DIR/issue-25396.rs:7:5
@@ -24,9 +23,8 @@ LL | use bar::Quux;
    = note: `Quux` must be defined only once in the type namespace of this module
 help: you can use `as` to change the binding name of the import
    |
-LL - use bar::Quux;
-LL + use bar::Quux as OtherQuux;
-   |
+LL | use bar::Quux as OtherQuux;
+   |               ++++++++++++
 
 error[E0252]: the name `blah` is defined multiple times
   --> $DIR/issue-25396.rs:10:5
@@ -39,9 +37,8 @@ LL | use bar::blah;
    = note: `blah` must be defined only once in the type namespace of this module
 help: you can use `as` to change the binding name of the import
    |
-LL - use bar::blah;
-LL + use bar::blah as other_blah;
-   |
+LL | use bar::blah as other_blah;
+   |               +++++++++++++
 
 error[E0252]: the name `WOMP` is defined multiple times
   --> $DIR/issue-25396.rs:13:5
@@ -54,9 +51,8 @@ LL | use bar::WOMP;
    = note: `WOMP` must be defined only once in the value namespace of this module
 help: you can use `as` to change the binding name of the import
    |
-LL - use bar::WOMP;
-LL + use bar::WOMP as OtherWOMP;
-   |
+LL | use bar::WOMP as OtherWOMP;
+   |               ++++++++++++
 
 error: aborting due to 4 previous errors
 
diff --git a/tests/ui/imports/issue-32354-suggest-import-rename.stderr b/tests/ui/imports/issue-32354-suggest-import-rename.stderr
@@ -9,9 +9,8 @@ LL | use extension2::ConstructorExtension;
    = note: `ConstructorExtension` must be defined only once in the type namespace of this module
 help: you can use `as` to change the binding name of the import
    |
-LL - use extension2::ConstructorExtension;
-LL + use extension2::ConstructorExtension as OtherConstructorExtension;
-   |
+LL | use extension2::ConstructorExtension as OtherConstructorExtension;
+   |                                      ++++++++++++++++++++++++++++
 
 error: aborting due to 1 previous error
 
diff --git a/tests/ui/imports/issue-45829/import-self.stderr b/tests/ui/imports/issue-45829/import-self.stderr
@@ -48,9 +48,8 @@ LL | use foo::self;
    = note: `foo` must be defined only once in the type namespace of this module
 help: you can use `as` to change the binding name of the import
    |
-LL - use foo::self;
-LL + use foo as other_foo;
-   |
+LL | use foo as other_foo::self;
+   |         ++++++++++++
 
 error[E0252]: the name `A` is defined multiple times
   --> $DIR/import-self.rs:16:11
diff --git a/tests/ui/imports/issue-45829/issue-45829.stderr b/tests/ui/imports/issue-45829/issue-45829.stderr
@@ -9,9 +9,8 @@ LL | use foo::{A, B as A};
    = note: `A` must be defined only once in the type namespace of this module
 help: you can use `as` to change the binding name of the import
    |
-LL - use foo::{A, B as A};
-LL + use foo::{A, B as OtherA};
-   |
+LL | use foo::{A, B as OtherA as A};
+   |                +++++++++
 
 error: aborting due to 1 previous error
 
diff --git a/tests/ui/imports/issue-45829/rename-use-vs-extern.stderr b/tests/ui/imports/issue-45829/rename-use-vs-extern.stderr
@@ -9,9 +9,8 @@ LL | use std as issue_45829_b;
    = note: `issue_45829_b` must be defined only once in the type namespace of this module
 help: you can use `as` to change the binding name of the import
    |
-LL - use std as issue_45829_b;
-LL + use std as other_issue_45829_b;
-   |
+LL | use std as other_issue_45829_b as issue_45829_b;
+   |         ++++++++++++++++++++++
 
 error: aborting due to 1 previous error
 
diff --git a/tests/ui/imports/issue-45829/rename-use-with-tabs.stderr b/tests/ui/imports/issue-45829/rename-use-with-tabs.stderr
@@ -9,9 +9,8 @@ LL | use foo::{A, bar::B    as    A};
    = note: `A` must be defined only once in the type namespace of this module
 help: you can use `as` to change the binding name of the import
    |
-LL - use foo::{A, bar::B    as    A};
-LL + use foo::{A, bar::B as OtherA};
-   |
+LL | use foo::{A, bar::B as OtherA    as    A};
+   |                     +++++++++
 
 error: aborting due to 1 previous error
 
diff --git a/tests/ui/imports/issue-45829/rename-with-path.stderr b/tests/ui/imports/issue-45829/rename-with-path.stderr
@@ -9,9 +9,8 @@ LL | use std::{collections::HashMap as A, sync::Arc as A};
    = note: `A` must be defined only once in the type namespace of this module
 help: you can use `as` to change the binding name of the import
    |
-LL - use std::{collections::HashMap as A, sync::Arc as A};
-LL + use std::{collections::HashMap as A, sync::Arc as OtherA};
-   |
+LL | use std::{collections::HashMap as A, sync::Arc as OtherA as A};
+   |                                                +++++++++
 
 error: aborting due to 1 previous error
 
diff --git a/tests/ui/imports/issue-45829/rename.stderr b/tests/ui/imports/issue-45829/rename.stderr
@@ -9,9 +9,8 @@ LL | use std as core;
    = note: `core` must be defined only once in the type namespace of this module
 help: you can use `as` to change the binding name of the import
    |
-LL - use std as core;
-LL + use std as other_core;
-   |
+LL | use std as other_core as core;
+   |         +++++++++++++
 
 error: aborting due to 1 previous error
 
diff --git a/tests/ui/imports/issue-52891.stderr b/tests/ui/imports/issue-52891.stderr
@@ -97,9 +97,8 @@ LL | use issue_52891::b::inner;
    = note: `inner` must be defined only once in the type namespace of this module
 help: you can use `as` to change the binding name of the import
    |
-LL - use issue_52891::b::inner;
-LL + use issue_52891::b::inner as other_inner;
-   |
+LL | use issue_52891::b::inner as other_inner;
+   |                           ++++++++++++++
 
 error[E0254]: the name `issue_52891` is defined multiple times
   --> $DIR/issue-52891.rs:31:19
diff --git a/tests/ui/imports/issue-8640.stderr b/tests/ui/imports/issue-8640.stderr
@@ -9,9 +9,8 @@ LL |     mod bar {}
    = note: `bar` must be defined only once in the type namespace of this module
 help: you can use `as` to change the binding name of the import
    |
-LL -     use baz::bar;
-LL +     use baz::bar as other_bar;
-   |
+LL |     use baz::bar as other_bar;
+   |                  ++++++++++++
 
 error: aborting due to 1 previous error
 
diff --git a/tests/ui/resolve/resolve-conflict-import-vs-extern-crate.stderr b/tests/ui/resolve/resolve-conflict-import-vs-extern-crate.stderr
@@ -7,9 +7,8 @@ LL | use std::slice as std;
    = note: `std` must be defined only once in the type namespace of this module
 help: you can use `as` to change the binding name of the import
    |
-LL - use std::slice as std;
-LL + use std::slice as other_std;
-   |
+LL | use std::slice as other_std as std;
+   |                ++++++++++++
 
 error: aborting due to 1 previous error
 
diff --git a/tests/ui/resolve/resolve-conflict-item-vs-import.stderr b/tests/ui/resolve/resolve-conflict-item-vs-import.stderr
@@ -10,9 +10,8 @@ LL | fn transmute() {}
    = note: `transmute` must be defined only once in the value namespace of this module
 help: you can use `as` to change the binding name of the import
    |
-LL - use std::mem::transmute;
-LL + use std::mem::transmute as other_transmute;
-   |
+LL | use std::mem::transmute as other_transmute;
+   |                         ++++++++++++++++++
 
 error: aborting due to 1 previous error
 
diff --git a/tests/ui/resolve/resolve-conflict-type-vs-import.stderr b/tests/ui/resolve/resolve-conflict-type-vs-import.stderr
diff --git a/tests/ui/variants/variant-namespacing.stderr b/tests/ui/variants/variant-namespacing.stderr

Original file line number	Diff line number	Diff line change
`@@ -371,6 +371,7 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {`
`371`	`371`	`};`
`372`	`372`
`373`	`373`	`let mut suggestion = None;`
	`374`	`+ let mut span = binding_span;`
`374`	`375`	`match import.kind {`
`375`	`376`	`ImportKind::Single { type_ns_only: true, .. } => {`
`376`	`377`	`suggestion = Some(format!("self as {suggested_name}"))`
`@@ -381,12 +382,10 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {`
`381`	`382`	`{`
`382`	`383`	`if let Ok(snippet) = self.tcx.sess.source_map().span_to_snippet(binding_span) {`
`383`	`384`	`if pos <= snippet.len() {`
`384`		`- suggestion = Some(format!(`
`385`		`- "{} as {}{}",`
`386`		`- &snippet[..pos],`
`387`		`- suggested_name,`
`388`		`- if snippet.ends_with(';') { ";" } else { "" }`
`389`		`- ))`
	`385`	`+ span = binding_span`
	`386`	`+ .with_hi(binding_span.lo() + BytePos(pos as u32))`
	`387`	`+ .shrink_to_hi();`
	`388`	`+ suggestion = Some(format!(" as {}", suggested_name,))`
`390`	`389`	`}`
`391`	`390`	`}`
`392`	`391`	`}`
`@@ -402,9 +401,9 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {`
`402`	`401`	`}`
`403`	`402`
`404`	`403`	`if let Some(suggestion) = suggestion {`
`405`		`- err.subdiagnostic(ChangeImportBindingSuggestion { span: binding_span, suggestion });`
	`404`	`+ err.subdiagnostic(ChangeImportBindingSuggestion { span, suggestion });`
`406`	`405`	`} else {`
`407`		`- err.subdiagnostic(ChangeImportBinding { span: binding_span });`
	`406`	`+ err.subdiagnostic(ChangeImportBinding { span });`
`408`	`407`	`}`
`409`	`408`	`}`
`410`	`409`