about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorGuillaume Gomez <guillaume1.gomez@gmail.com>2016-08-05 16:12:56 +0200
committerGitHub <noreply@github.com>2016-08-05 16:12:56 +0200
commit9186db86fd209fa73e34cacb9155b024aef76c1f (patch)
tree7805b64aea0d070200c634962a82621611910d82 /src
parent158597fcd59d979e20e421c12536ba422f3aca59 (diff)
parentc89e27824f8f30e0c8dd153a9f6bb6a31ddfc65b (diff)
downloadrust-9186db86fd209fa73e34cacb9155b024aef76c1f.tar.gz
rust-9186db86fd209fa73e34cacb9155b024aef76c1f.zip
Rollup merge of #35266 - circuitfox:35247-E0109-update-error-format, r=jonathandturner
E0109 Update error format

Fixes #35247 as part of #35233.

r? @jonathandturner
Diffstat (limited to 'src')
-rw-r--r--src/librustc/middle/astconv_util.rs6
-rw-r--r--src/test/compile-fail/E0109.rs1
2 files changed, 5 insertions, 2 deletions
diff --git a/src/librustc/middle/astconv_util.rs b/src/librustc/middle/astconv_util.rs
index e856eb84ff2..f9a05056a7c 100644
--- 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
index 9fc47842250..2e4cbf86926 100644
--- 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() {
 }