diff options
| author | Christian Poveda <cn.poveda.ruiz@gmail.com> | 2016-08-07 00:29:24 -0500 |
|---|---|---|
| committer | Christian Poveda <cn.poveda.ruiz@gmail.com> | 2016-08-07 17:00:19 -0500 |
| commit | 8b111a7cf5dac2e592bdec013d8de3e06dcf19d3 (patch) | |
| tree | 58b5fba8035ace8769b6ea82f1dffa2e9fc5cb3b | |
| parent | ddf92ffae4b8fc74474241f064f41f09db585ed8 (diff) | |
| download | rust-8b111a7cf5dac2e592bdec013d8de3e06dcf19d3.tar.gz rust-8b111a7cf5dac2e592bdec013d8de3e06dcf19d3.zip | |
Updated E0087 to new format
| -rw-r--r-- | src/librustc_typeck/check/mod.rs | 19 | ||||
| -rw-r--r-- | src/test/compile-fail/E0087.rs | 1 |
2 files changed, 12 insertions, 8 deletions
diff --git a/src/librustc_typeck/check/mod.rs b/src/librustc_typeck/check/mod.rs index 8da06120873..2e05231f9fc 100644 --- a/src/librustc_typeck/check/mod.rs +++ b/src/librustc_typeck/check/mod.rs @@ -4367,14 +4367,17 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> { if i < type_count { substs.types.push(space, t); } else if i == type_count { - span_err!(self.tcx.sess, typ.span, E0087, - "too many type parameters provided: \ - expected at most {} parameter{}, \ - found {} parameter{}", - type_count, - if type_count == 1 {""} else {"s"}, - data.types.len(), - if data.types.len() == 1 {""} else {"s"}); + struct_span_err!(self.tcx.sess, typ.span, E0087, + "too many type parameters provided: \ + expected at most {} parameter{}, \ + found {} parameter{}", + type_count, + if type_count == 1 {""} else {"s"}, + data.types.len(), + if data.types.len() == 1 {""} else {"s"}) + .span_label(typ.span , &format!("expected {} parameter{}", + type_count, + if type_count == 1 {""} else {"s"})).emit(); substs.types.truncate(space, 0); break; } diff --git a/src/test/compile-fail/E0087.rs b/src/test/compile-fail/E0087.rs index ec559fc8389..63115f093c3 100644 --- a/src/test/compile-fail/E0087.rs +++ b/src/test/compile-fail/E0087.rs @@ -12,4 +12,5 @@ fn foo<T>() {} fn main() { foo::<f64, bool>(); //~ ERROR E0087 + //~^ NOTE expected } |