resolve: More precise spans for privacy errors

Author: petrochenkov

src/librustc_resolve/lib.rs

@@ -1207,7 +1207,7 @@ enum NameBindingKind<'a> {
     }
 }
 
-struct PrivacyError<'a>(Span, Name, &'a NameBinding<'a>);
+struct PrivacyError<'a>(Span, Ident, &'a NameBinding<'a>);
 
 struct UseError<'a> {
     err: DiagnosticBuilder<'a>,
@@ -4743,9 +4743,11 @@ impl<'a, 'crateloader: 'a> Resolver<'a, 'crateloader> {
             }
         }
 
-        for &PrivacyError(span, name, binding) in &self.privacy_errors {
-            if !reported_spans.insert(span) { continue }
-            span_err!(self.session, span, E0603, "{} `{}` is private", binding.descr(), name);
+        for &PrivacyError(dedup_span, ident, binding) in &self.privacy_errors {
+            if reported_spans.insert(dedup_span) {
+                span_err!(self.session, ident.span, E0603, "{} `{}` is private",
+                          binding.descr(), ident.name);
+            }
         }
     }
 

src/librustc_resolve/resolve_imports.rs

@@ -275,7 +275,7 @@ impl<'a, 'crateloader> Resolver<'a, 'crateloader> {
                     return Ok(self.dummy_binding);
                 }
                 if !self.is_accessible(binding.vis) {
-                    self.privacy_errors.push(PrivacyError(path_span, ident.name, binding));
+                    self.privacy_errors.push(PrivacyError(path_span, ident, binding));
                 }
             }
 

src/test/ui/error-codes/E0603.stderr

@@ -1,8 +1,8 @@
 error[E0603]: constant `PRIVATE` is private
-  --> $DIR/E0603.rs:16:5
+  --> $DIR/E0603.rs:16:17
    |
 LL |     SomeModule::PRIVATE; //~ ERROR E0603
-   |     ^^^^^^^^^^^^^^^^^^^
+   |                 ^^^^^^^
 
 error: aborting due to previous error
 

src/test/ui/error-festival.stderr

@@ -5,10 +5,10 @@ LL |     y = 2;
    |     ^ did you mean `x`?
 
 error[E0603]: constant `FOO` is private
-  --> $DIR/error-festival.rs:32:5
+  --> $DIR/error-festival.rs:32:10
    |
 LL |     foo::FOO;
-   |     ^^^^^^^^
+   |          ^^^
 
 error[E0368]: binary assignment operation `+=` cannot be applied to type `&str`
   --> $DIR/error-festival.rs:22:5

src/test/ui/export-import.stderr

@@ -1,8 +1,8 @@
 error[E0603]: function `unexported` is private
-  --> $DIR/export-import.rs:11:5
+  --> $DIR/export-import.rs:11:8
    |
 LL | use m::unexported;
-   |     ^^^^^^^^^^^^^
+   |        ^^^^^^^^^^
 
 error: aborting due to previous error
 

src/test/ui/export-tag-variant.stderr

@@ -1,8 +1,8 @@
 error[E0603]: enum `y` is private
-  --> $DIR/export-tag-variant.rs:17:21
+  --> $DIR/export-tag-variant.rs:17:26
    |
 LL | fn main() { let z = foo::y::y1; } //~ ERROR: enum `y` is private
-   |                     ^^^^^^^^^^
+   |                          ^
 
 error: aborting due to previous error
 

src/test/ui/export.stderr

@@ -23,10 +23,10 @@ LL |     fn z(y: isize) { log(debug, y); }
    |                          ^^^^^ not found in this scope
 
 error[E0603]: function `z` is private
-  --> $DIR/export.rs:20:13
+  --> $DIR/export.rs:20:18
    |
 LL | fn main() { foo::z(10); } //~ ERROR function `z` is private
-   |             ^^^^^^
+   |                  ^
 
 error: aborting due to 5 previous errors
 

src/test/ui/extern/extern-crate-visibility.stderr

@@ -1,14 +1,14 @@
 error[E0603]: extern crate `core` is private
-  --> $DIR/extern-crate-visibility.rs:16:5
+  --> $DIR/extern-crate-visibility.rs:16:10
    |
 LL | use foo::core::cell; //~ ERROR extern crate `core` is private
-   |     ^^^^^^^^^^^^^^^
+   |          ^^^^
 
 error[E0603]: extern crate `core` is private
-  --> $DIR/extern-crate-visibility.rs:19:5
+  --> $DIR/extern-crate-visibility.rs:19:10
    |
 LL |     foo::core::cell::Cell::new(0); //~ ERROR extern crate `core` is private
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |          ^^^^
 
 error: aborting due to 2 previous errors
 

src/test/ui/hygiene/privacy.stderr

@@ -1,8 +1,8 @@
 error[E0603]: function `f` is private
-  --> $DIR/privacy.rs:26:9
+  --> $DIR/privacy.rs:26:14
    |
 LL |         foo::f() //~ ERROR `f` is private
-   |         ^^^^^^
+   |              ^
 
 error: aborting due to previous error
 

src/test/ui/import.stderr

@@ -11,10 +11,10 @@ LL |     use foo; //~ ERROR unresolved import `foo` [E0432]
    |         ^^^ no `foo` in the root
 
 error[E0603]: unresolved item `foo` is private
-  --> $DIR/import.rs:23:5
+  --> $DIR/import.rs:23:10
    |
 LL |     zed::foo(); //~ ERROR `foo` is private
-   |     ^^^^^^^^
+   |          ^^^
 
 error: aborting due to 3 previous errors