Rollup merge of rust-lang#35412 - chamoysvoice:e0220, r=jonathandturner

Update E0220 message to new format Part of rust-lang#35233 . Fixes rust-lang#35385. r? @jonathandturner Should it keep E0191?
sophiajt · Aug 7, 2016 · eb9db9f · eb9db9f
2 parents f40b2ff + 0e13b63
commit eb9db9f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/librustc_typeck/astconv.rs b/src/librustc_typeck/astconv.rs
@@ -1273,10 +1273,14 @@ impl<'o, 'gcx: 'tcx, 'tcx> AstConv<'gcx, 'tcx>+'o {
         -> Result<ty::PolyTraitRef<'tcx>, ErrorReported>
     {
         if bounds.is_empty() {
-            span_err!(self.tcx().sess, span, E0220,
-                      "associated type `{}` not found for `{}`",
-                      assoc_name,
-                      ty_param_name);
+            struct_span_err!(self.tcx().sess, span, E0220,
+                             "associated type `{}` not found for `{}`",
+                             assoc_name,
+                             ty_param_name)
+                .span_label(span, &format!("associated `{}` not found in `{}`",
+                            assoc_name,
+                            ty_param_name))
+                .emit();
             return Err(ErrorReported);
         }
 

diff --git a/src/test/compile-fail/E0220.rs b/src/test/compile-fail/E0220.rs
@@ -13,6 +13,7 @@ trait Trait {
 }
 
 type Foo = Trait<F=i32>; //~ ERROR E0220
+                         //~| NOTE associated `F` not found in `Trait`
                          //~^ ERROR E0191
 
 fn main() {