Rollup merge of rust-lang#35266 - circuitfox:35247-E0109-update-error…

…-format, r=jonathandturner E0109 Update error format Fixes rust-lang#35247 as part of rust-lang#35233. r? @jonathandturner
GuillaumeGomez · Aug 5, 2016 · 9186db8 · 9186db8
2 parents 158597f + c89e278
commit 9186db8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/librustc/middle/astconv_util.rs b/src/librustc/middle/astconv_util.rs
@@ -24,8 +24,10 @@ impl<'a, 'gcx, 'tcx> TyCtxt<'a, 'gcx, 'tcx> {
  pub fn prohibit_type_params(self, segments: &[ast::PathSegment]) {
  for segment in segments {
  for typ in segment.parameters.types() {
- span_err!(self.sess, typ.span, E0109,
- "type parameters are not allowed on this type");
+ struct_span_err!(self.sess, typ.span, E0109,
+ "type parameters are not allowed on this type")
+ .span_label(typ.span, &format!("type parameter not allowed"))
+ .emit();
  break;
  }
  for lifetime in segment.parameters.lifetimes() {

diff --git a/src/test/compile-fail/E0109.rs b/src/test/compile-fail/E0109.rs
@@ -9,6 +9,7 @@
 // except according to those terms.
 
 type X = u32<i32>; //~ ERROR E0109
+ //~| NOTE type parameter not allowed
 
 fn main() {
 }