Use local spans only

Author: estebank

src/librustc_typeck/check/method/suggest.rs

@@ -176,7 +176,8 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
 
                 let actual = self.resolve_type_vars_if_possible(&rcvr_ty);
                 let ty_string = self.ty_to_string(actual);
-                let type_str = if mode == Mode::MethodCall {
+                let is_method = mode == Mode::MethodCall;
+                let type_str = if is_method {
                     "method"
                 } else if actual.is_enum() {
                     "variant"
@@ -207,16 +208,17 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
                 };
 
                 if let Some(def) =  actual.ty_adt_def() {
-                    let full_sp = tcx.def_span(def.did);
-                    let def_sp = tcx.sess.codemap().def_span(full_sp);
-                    err.span_label(def_sp, format!("{} `{}` not found {}",
-                                                   type_str,
-                                                   item_name,
-                                                   if def.is_enum() {
-                                                       "here"
-                                                   } else {
-                                                       "for this"
-                                                   }));
+                    if let Some(full_sp) = tcx.hir.span_if_local(def.did) {
+                        let def_sp = tcx.sess.codemap().def_span(full_sp);
+                        err.span_label(def_sp, format!("{} `{}` not found {}",
+                                                       type_str,
+                                                       item_name,
+                                                       if def.is_enum() && !is_method {
+                                                           "here"
+                                                       } else {
+                                                           "for this"
+                                                       }));
+                    }
                 }
 
                 // If the method name is the name of a field with a function or closure type,

src/test/compile-fail/bogus-tag.rs

@@ -16,6 +16,8 @@ fn main() {
     let red: color = color::rgb(255, 0, 0);
     match red {
       color::rgb(r, g, b) => { println!("rgb"); }
-      color::hsl(h, s, l) => { println!("hsl"); }  //~ ERROR no variant
+      color::hsl(h, s, l) => { println!("hsl"); }
+      //~^ ERROR no variant
+      //~| NOTE variant not found in `color`
     }
 }

src/test/compile-fail/issue-22933-2.rs

@@ -13,6 +13,7 @@ enum Delicious { //~ NOTE variant `PIE` not found here
     Apple    = 0x2,
     ApplePie = Delicious::Apple as isize | Delicious::PIE as isize,
     //~^ ERROR no variant named `PIE` found for type `Delicious`
+    //~| NOTE variant not found in `Delicious`
 }
 
 fn main() {}

src/test/compile-fail/issue-23173.rs

@@ -14,5 +14,7 @@ enum Token { LeftParen, RightParen, Plus, Minus, /* etc */ }
 fn use_token(token: &Token) { unimplemented!() }
 
 fn main() {
-    use_token(&Token::Homura); //~ ERROR no variant named `Homura`
+    use_token(&Token::Homura);
+    //~^ ERROR no variant named `Homura`
+    //~| NOTE variant not found in `Token`
 }

src/test/compile-fail/issue-23217.rs

@@ -11,6 +11,7 @@
 pub enum SomeEnum { //~ NOTE variant `A` not found here
     B = SomeEnum::A,
     //~^ ERROR no variant named `A` found for type `SomeEnum`
+    //~| NOTE variant not found in `SomeEnum`
 }
 
 fn main() {}

src/test/compile-fail/issue-28971.rs

@@ -18,6 +18,7 @@ fn main(){
         match Foo::Bar(1) {
             Foo::Baz(..) => (),
             //~^ ERROR no variant named `Baz` found for type `Foo`
+            //~| NOTE variant not found in `Foo`
             _ => (),
         }
     });

src/test/ui/impl-trait/no-method-suggested-traits.stderr

@@ -12,22 +12,17 @@ error[E0599]: no method named `method` found for type `u32` in the current scope
            candidate #4: `use no_method_suggested_traits::Reexported;`
 
 error[E0599]: no method named `method` found for type `std::rc::Rc<&mut std::boxed::Box<&u32>>` in the current scope
-   --> $DIR/no-method-suggested-traits.rs:38:44
-    |
-38  |     std::rc::Rc::new(&mut Box::new(&1u32)).method();
-    |                                            ^^^^^^
-    | 
-   ::: /checkout/src/liballoc/rc.rs
-    |
-284 | pub struct Rc<T: ?Sized> {
-    | ------------------------ method `method` not found for this
-    |
-    = help: items from traits can only be used if the trait is in scope
-    = note: the following traits are implemented but not in scope, perhaps add a `use` for one of them:
-            candidate #1: `use foo::Bar;`
-            candidate #2: `use no_method_suggested_traits::foo::PubPub;`
-            candidate #3: `use no_method_suggested_traits::qux::PrivPub;`
-            candidate #4: `use no_method_suggested_traits::Reexported;`
+  --> $DIR/no-method-suggested-traits.rs:38:44
+   |
+38 |     std::rc::Rc::new(&mut Box::new(&1u32)).method();
+   |                                            ^^^^^^
+   |
+   = help: items from traits can only be used if the trait is in scope
+   = note: the following traits are implemented but not in scope, perhaps add a `use` for one of them:
+           candidate #1: `use foo::Bar;`
+           candidate #2: `use no_method_suggested_traits::foo::PubPub;`
+           candidate #3: `use no_method_suggested_traits::qux::PrivPub;`
+           candidate #4: `use no_method_suggested_traits::Reexported;`
 
 error[E0599]: no method named `method` found for type `char` in the current scope
   --> $DIR/no-method-suggested-traits.rs:44:9
@@ -40,19 +35,14 @@ error[E0599]: no method named `method` found for type `char` in the current scop
            candidate #1: `use foo::Bar;`
 
 error[E0599]: no method named `method` found for type `std::rc::Rc<&mut std::boxed::Box<&char>>` in the current scope
-   --> $DIR/no-method-suggested-traits.rs:48:43
-    |
-48  |     std::rc::Rc::new(&mut Box::new(&'a')).method();
-    |                                           ^^^^^^
-    | 
-   ::: /checkout/src/liballoc/rc.rs
-    |
-284 | pub struct Rc<T: ?Sized> {
-    | ------------------------ method `method` not found for this
-    |
-    = help: items from traits can only be used if the trait is in scope
-    = note: the following trait is implemented but not in scope, perhaps add a `use` for it:
-            candidate #1: `use foo::Bar;`
+  --> $DIR/no-method-suggested-traits.rs:48:43
+   |
+48 |     std::rc::Rc::new(&mut Box::new(&'a')).method();
+   |                                           ^^^^^^
+   |
+   = help: items from traits can only be used if the trait is in scope
+   = note: the following trait is implemented but not in scope, perhaps add a `use` for it:
+           candidate #1: `use foo::Bar;`
 
 error[E0599]: no method named `method` found for type `i32` in the current scope
   --> $DIR/no-method-suggested-traits.rs:53:10
@@ -65,18 +55,14 @@ error[E0599]: no method named `method` found for type `i32` in the current scope
            candidate #1: `use no_method_suggested_traits::foo::PubPub;`
 
 error[E0599]: no method named `method` found for type `std::rc::Rc<&mut std::boxed::Box<&i32>>` in the current scope
-   --> $DIR/no-method-suggested-traits.rs:57:44
-    |
-57  |     std::rc::Rc::new(&mut Box::new(&1i32)).method();
-    | 
-   ::: /checkout/src/liballoc/rc.rs
-    |
-284 | pub struct Rc<T: ?Sized> {
-    | ------------------------ method `method` not found for this
-    |
-    = help: items from traits can only be used if the trait is in scope
-    = note: the following trait is implemented but not in scope, perhaps add a `use` for it:
-            candidate #1: `use no_method_suggested_traits::foo::PubPub;`
+  --> $DIR/no-method-suggested-traits.rs:57:44
+   |
+57 |     std::rc::Rc::new(&mut Box::new(&1i32)).method();
+   |                                            ^^^^^^
+   |
+   = help: items from traits can only be used if the trait is in scope
+   = note: the following trait is implemented but not in scope, perhaps add a `use` for it:
+           candidate #1: `use no_method_suggested_traits::foo::PubPub;`
 
 error[E0599]: no method named `method` found for type `Foo` in the current scope
   --> $DIR/no-method-suggested-traits.rs:62:9
@@ -97,24 +83,19 @@ error[E0599]: no method named `method` found for type `Foo` in the current scope
            candidate #6: `no_method_suggested_traits::Reexported`
 
 error[E0599]: no method named `method` found for type `std::rc::Rc<&mut std::boxed::Box<&Foo>>` in the current scope
-   --> $DIR/no-method-suggested-traits.rs:71:43
-    |
-71  |     std::rc::Rc::new(&mut Box::new(&Foo)).method();
-    |                                           ^^^^^^
-    | 
-   ::: /checkout/src/liballoc/rc.rs
-    |
-284 | pub struct Rc<T: ?Sized> {
-    | ------------------------ method `method` not found for this
-    |
-    = help: items from traits can only be used if the trait is implemented and in scope
-    = note: the following traits define an item `method`, perhaps you need to implement one of them:
-            candidate #1: `foo::Bar`
-            candidate #2: `no_method_suggested_traits::foo::PubPub`
-            candidate #3: `no_method_suggested_traits::bar::PubPriv`
-            candidate #4: `no_method_suggested_traits::qux::PrivPub`
-            candidate #5: `no_method_suggested_traits::quz::PrivPriv`
-            candidate #6: `no_method_suggested_traits::Reexported`
+  --> $DIR/no-method-suggested-traits.rs:71:43
+   |
+71 |     std::rc::Rc::new(&mut Box::new(&Foo)).method();
+   |                                           ^^^^^^
+   |
+   = help: items from traits can only be used if the trait is implemented and in scope
+   = note: the following traits define an item `method`, perhaps you need to implement one of them:
+           candidate #1: `foo::Bar`
+           candidate #2: `no_method_suggested_traits::foo::PubPub`
+           candidate #3: `no_method_suggested_traits::bar::PubPriv`
+           candidate #4: `no_method_suggested_traits::qux::PrivPub`
+           candidate #5: `no_method_suggested_traits::quz::PrivPriv`
+           candidate #6: `no_method_suggested_traits::Reexported`
 
 error[E0599]: no method named `method2` found for type `u64` in the current scope
   --> $DIR/no-method-suggested-traits.rs:81:10
@@ -127,60 +108,40 @@ error[E0599]: no method named `method2` found for type `u64` in the current scop
            candidate #1: `foo::Bar`
 
 error[E0599]: no method named `method2` found for type `std::rc::Rc<&mut std::boxed::Box<&u64>>` in the current scope
-   --> $DIR/no-method-suggested-traits.rs:85:44
-    |
-85  |     std::rc::Rc::new(&mut Box::new(&1u64)).method2();
-    |                                            ^^^^^^^
-    | 
-   ::: /checkout/src/liballoc/rc.rs
-    |
-284 | pub struct Rc<T: ?Sized> {
-    | ------------------------ method `method2` not found for this
-    |
-    = help: items from traits can only be used if the trait is implemented and in scope
-    = note: the following trait defines an item `method2`, perhaps you need to implement it:
-            candidate #1: `foo::Bar`
+  --> $DIR/no-method-suggested-traits.rs:85:44
+   |
+85 |     std::rc::Rc::new(&mut Box::new(&1u64)).method2();
+   |                                            ^^^^^^^
+   |
+   = help: items from traits can only be used if the trait is implemented and in scope
+   = note: the following trait defines an item `method2`, perhaps you need to implement it:
+           candidate #1: `foo::Bar`
 
 error[E0599]: no method named `method2` found for type `no_method_suggested_traits::Foo` in the current scope
   --> $DIR/no-method-suggested-traits.rs:90:37
    |
 90 |     no_method_suggested_traits::Foo.method2();
    |                                     ^^^^^^^
-   | 
-  ::: $DIR/auxiliary/no_method_suggested_traits.rs
-   |
-13 | pub struct Foo;
-   | --------------- method `method2` not found for this
    |
    = help: items from traits can only be used if the trait is implemented and in scope
    = note: the following trait defines an item `method2`, perhaps you need to implement it:
            candidate #1: `foo::Bar`
 
 error[E0599]: no method named `method2` found for type `std::rc::Rc<&mut std::boxed::Box<&no_method_suggested_traits::Foo>>` in the current scope
-   --> $DIR/no-method-suggested-traits.rs:94:71
-    |
-94  |     std::rc::Rc::new(&mut Box::new(&no_method_suggested_traits::Foo)).method2();
-    |                                                                       ^^^^^^^
-    | 
-   ::: /checkout/src/liballoc/rc.rs
-    |
-284 | pub struct Rc<T: ?Sized> {
-    | ------------------------ method `method2` not found for this
-    |
-    = help: items from traits can only be used if the trait is implemented and in scope
-    = note: the following trait defines an item `method2`, perhaps you need to implement it:
-            candidate #1: `foo::Bar`
+  --> $DIR/no-method-suggested-traits.rs:94:71
+   |
+94 |     std::rc::Rc::new(&mut Box::new(&no_method_suggested_traits::Foo)).method2();
+   |                                                                       ^^^^^^^
+   |
+   = help: items from traits can only be used if the trait is implemented and in scope
+   = note: the following trait defines an item `method2`, perhaps you need to implement it:
+           candidate #1: `foo::Bar`
 
 error[E0599]: no method named `method2` found for type `no_method_suggested_traits::Bar` in the current scope
   --> $DIR/no-method-suggested-traits.rs:98:40
    |
 98 |     no_method_suggested_traits::Bar::X.method2();
    |                                        ^^^^^^^
-   | 
-  ::: $DIR/auxiliary/no_method_suggested_traits.rs
-   |
-14 | pub enum Bar { X }
-   | ------------ method `method2` not found here
    |
    = help: items from traits can only be used if the trait is implemented and in scope
    = note: the following trait defines an item `method2`, perhaps you need to implement it:
@@ -191,11 +152,6 @@ error[E0599]: no method named `method2` found for type `std::rc::Rc<&mut std::bo
     |
 102 |     std::rc::Rc::new(&mut Box::new(&no_method_suggested_traits::Bar::X)).method2();
     |                                                                          ^^^^^^^
-    | 
-   ::: /checkout/src/liballoc/rc.rs
-    |
-284 | pub struct Rc<T: ?Sized> {
-    | ------------------------ method `method2` not found for this
     |
     = help: items from traits can only be used if the trait is implemented and in scope
     = note: the following trait defines an item `method2`, perhaps you need to implement it:
@@ -219,11 +175,6 @@ error[E0599]: no method named `method3` found for type `std::rc::Rc<&mut std::bo
     |
 111 |     std::rc::Rc::new(&mut Box::new(&Foo)).method3();
     |                                           ^^^^^^^
-    | 
-   ::: /checkout/src/liballoc/rc.rs
-    |
-284 | pub struct Rc<T: ?Sized> {
-    | ------------------------ method `method3` not found for this
     |
     = help: items from traits can only be used if the trait is implemented and in scope
     = note: the following trait defines an item `method3`, perhaps you need to implement it:
@@ -233,7 +184,7 @@ error[E0599]: no method named `method3` found for type `Bar` in the current scop
    --> $DIR/no-method-suggested-traits.rs:115:12
     |
 15  | enum Bar { X }
-    | -------- method `method3` not found here
+    | -------- method `method3` not found for this
 ...
 115 |     Bar::X.method3();
     |            ^^^^^^^
@@ -247,11 +198,6 @@ error[E0599]: no method named `method3` found for type `std::rc::Rc<&mut std::bo
     |
 119 |     std::rc::Rc::new(&mut Box::new(&Bar::X)).method3();
     |                                              ^^^^^^^
-    | 
-   ::: /checkout/src/liballoc/rc.rs
-    |
-284 | pub struct Rc<T: ?Sized> {
-    | ------------------------ method `method3` not found for this
     |
     = help: items from traits can only be used if the trait is implemented and in scope
     = note: the following trait defines an item `method3`, perhaps you need to implement it:
@@ -268,55 +214,30 @@ error[E0599]: no method named `method3` found for type `std::rc::Rc<&mut std::bo
     |
 126 |     std::rc::Rc::new(&mut Box::new(&1_usize)).method3(); //~ ERROR no method named
     |                                               ^^^^^^^
-    | 
-   ::: /checkout/src/liballoc/rc.rs
-    |
-284 | pub struct Rc<T: ?Sized> {
-    | ------------------------ method `method3` not found for this
 
 error[E0599]: no method named `method3` found for type `no_method_suggested_traits::Foo` in the current scope
    --> $DIR/no-method-suggested-traits.rs:127:37
     |
 127 |     no_method_suggested_traits::Foo.method3();  //~ ERROR no method named
     |                                     ^^^^^^^
-    | 
-   ::: $DIR/auxiliary/no_method_suggested_traits.rs
-    |
-13  | pub struct Foo;
-    | --------------- method `method3` not found for this
 
 error[E0599]: no method named `method3` found for type `std::rc::Rc<&mut std::boxed::Box<&no_method_suggested_traits::Foo>>` in the current scope
    --> $DIR/no-method-suggested-traits.rs:128:71
     |
 128 |     std::rc::Rc::new(&mut Box::new(&no_method_suggested_traits::Foo)).method3();
     |                                                                       ^^^^^^^
-    | 
-   ::: /checkout/src/liballoc/rc.rs
-    |
-284 | pub struct Rc<T: ?Sized> {
-    | ------------------------ method `method3` not found for this
 
 error[E0599]: no method named `method3` found for type `no_method_suggested_traits::Bar` in the current scope
    --> $DIR/no-method-suggested-traits.rs:130:40
     |
 130 |     no_method_suggested_traits::Bar::X.method3();  //~ ERROR no method named
     |                                        ^^^^^^^
-    | 
-   ::: $DIR/auxiliary/no_method_suggested_traits.rs
-    |
-14  | pub enum Bar { X }
-    | ------------ method `method3` not found here
 
 error[E0599]: no method named `method3` found for type `std::rc::Rc<&mut std::boxed::Box<&no_method_suggested_traits::Bar>>` in the current scope
    --> $DIR/no-method-suggested-traits.rs:131:74
     |
 131 |     std::rc::Rc::new(&mut Box::new(&no_method_suggested_traits::Bar::X)).method3();
     |                                                                          ^^^^^^^
-    | 
-   ::: /checkout/src/liballoc/rc.rs
-    |
-284 | pub struct Rc<T: ?Sized> {
-    | ------------------------ method `method3` not found for this
 
 error: aborting due to 24 previous errors