Fix use rename suggestion

Author: estebank

compiler/rustc_resolve/src/diagnostics.rs

@@ -383,8 +383,11 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
                     if let Ok(snippet) = self.tcx.sess.source_map().span_to_snippet(binding_span) {
                         if pos <= snippet.len() {
                             span = binding_span
-                                .with_hi(binding_span.lo() + BytePos(pos as u32))
-                                .shrink_to_hi();
+                                .with_lo(binding_span.lo() + BytePos(pos as u32))
+                                .with_hi(
+                                    binding_span.hi()
+                                        - BytePos(if snippet.ends_with(';') { 1 } else { 0 }),
+                                );
                             suggestion = Some(format!(" as {}", suggested_name,))
                         }
                     }

tests/ui/imports/issue-45829/import-self.stderr

@@ -48,8 +48,9 @@ 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 as other_foo::self;
-   |         ++++++++++++
+LL - use foo::self;
+LL + use foo as other_foo;
+   |
 
 error[E0252]: the name `A` is defined multiple times
   --> $DIR/import-self.rs:16:11

tests/ui/imports/issue-45829/issue-45829.stderr

@@ -9,8 +9,9 @@ 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 OtherA as A};
-   |                +++++++++
+LL - use foo::{A, B as A};
+LL + use foo::{A, B as OtherA};
+   |
 
 error: aborting due to 1 previous error
 

tests/ui/imports/issue-45829/rename-use-vs-extern.stderr

@@ -9,8 +9,9 @@ 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 other_issue_45829_b as issue_45829_b;
-   |         ++++++++++++++++++++++
+LL - use std as issue_45829_b;
+LL + use std as other_issue_45829_b;
+   |
 
 error: aborting due to 1 previous error
 

tests/ui/imports/issue-45829/rename-use-with-tabs.stderr

@@ -9,8 +9,9 @@ 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 OtherA    as    A};
-   |                     +++++++++
+LL - use foo::{A, bar::B    as    A};
+LL + use foo::{A, bar::B as OtherA};
+   |
 
 error: aborting due to 1 previous error
 

tests/ui/imports/issue-45829/rename-with-path.stderr

@@ -9,8 +9,9 @@ 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 OtherA as A};
-   |                                                +++++++++
+LL - use std::{collections::HashMap as A, sync::Arc as A};
+LL + use std::{collections::HashMap as A, sync::Arc as OtherA};
+   |
 
 error: aborting due to 1 previous error
 

tests/ui/imports/issue-45829/rename.stderr

@@ -9,8 +9,9 @@ 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 other_core as core;
-   |         +++++++++++++
+LL - use std as core;
+LL + use std as other_core;
+   |
 
 error: aborting due to 1 previous error
 

tests/ui/resolve/resolve-conflict-import-vs-extern-crate.stderr

@@ -7,8 +7,9 @@ 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 other_std as std;
-   |                ++++++++++++
+LL - use std::slice as std;
+LL + use std::slice as other_std;
+   |
 
 error: aborting due to 1 previous error