diff options
| author | Niko Matsakis <niko@alum.mit.edu> | 2014-12-13 05:06:36 -0500 |
|---|---|---|
| committer | Niko Matsakis <niko@alum.mit.edu> | 2014-12-14 04:21:57 -0500 |
| commit | f6d60f32080314f1167dd3efb13d772528f500f0 (patch) | |
| tree | 6909be68a379c40b2abfc7bbcb0f1bcae9b1b0cf /src | |
| parent | 840ce00a9b056e5ed16eb735d0758dbaa7c2c8f4 (diff) | |
| download | rust-f6d60f32080314f1167dd3efb13d772528f500f0.tar.gz rust-f6d60f32080314f1167dd3efb13d772528f500f0.zip | |
Stop using diagnostics to avoid merge conflicts.
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustc/diagnostics.rs | 3 | ||||
| -rw-r--r-- | src/librustc_typeck/astconv.rs | 5 | ||||
| -rw-r--r-- | src/librustc_typeck/check/mod.rs | 5 | ||||
| -rw-r--r-- | src/test/compile-fail/unboxed-closure-sugar-used-on-struct-1.rs | 2 | ||||
| -rw-r--r-- | src/test/compile-fail/unboxed-closure-sugar-used-on-struct.rs | 2 |
5 files changed, 9 insertions, 8 deletions
diff --git a/src/librustc/diagnostics.rs b/src/librustc/diagnostics.rs index dd5cb8e3b4d..fcac718b370 100644 --- a/src/librustc/diagnostics.rs +++ b/src/librustc/diagnostics.rs @@ -67,6 +67,5 @@ register_diagnostics!( E0173, E0174, E0177, - E0178, - E0179 // parenthesized params may only be used with a trait + E0178 ) diff --git a/src/librustc_typeck/astconv.rs b/src/librustc_typeck/astconv.rs index 4ea2a228701..762aed3dfa8 100644 --- a/src/librustc_typeck/astconv.rs +++ b/src/librustc_typeck/astconv.rs @@ -235,8 +235,9 @@ fn ast_path_substs_for_ty<'tcx,AC,RS>( convert_angle_bracketed_parameters(this, rscope, data) } ast::ParenthesizedParameters(ref data) => { - span_err!(tcx.sess, path.span, E0173, - "parenthesized parameters may only be used with a trait"); + tcx.sess.span_err( + path.span, + "parenthesized parameters may only be used with a trait"); (Vec::new(), convert_parenthesized_parameters(this, data), Vec::new()) } }; diff --git a/src/librustc_typeck/check/mod.rs b/src/librustc_typeck/check/mod.rs index 37147eb8a87..fdc57579d07 100644 --- a/src/librustc_typeck/check/mod.rs +++ b/src/librustc_typeck/check/mod.rs @@ -5143,8 +5143,9 @@ pub fn instantiate_path<'a, 'tcx>(fcx: &FnCtxt<'a, 'tcx>, } ast::ParenthesizedParameters(ref data) => { - span_err!(fcx.tcx().sess, span, E0173, - "parenthesized parameters may only be used with a trait"); + fcx.tcx().sess.span_err( + span, + "parenthesized parameters may only be used with a trait"); push_explicit_parenthesized_parameters_from_segment_to_substs( fcx, space, span, type_defs, data, substs); } diff --git a/src/test/compile-fail/unboxed-closure-sugar-used-on-struct-1.rs b/src/test/compile-fail/unboxed-closure-sugar-used-on-struct-1.rs index 2c1dee36b9a..a6184caf68b 100644 --- a/src/test/compile-fail/unboxed-closure-sugar-used-on-struct-1.rs +++ b/src/test/compile-fail/unboxed-closure-sugar-used-on-struct-1.rs @@ -17,7 +17,7 @@ struct Bar<A,R> { fn bar() { let x: Box<Bar()> = panic!(); - //~^ ERROR E0169 + //~^ ERROR parenthesized parameters may only be used with a trait } fn main() { } diff --git a/src/test/compile-fail/unboxed-closure-sugar-used-on-struct.rs b/src/test/compile-fail/unboxed-closure-sugar-used-on-struct.rs index db94127a9ea..d5fb505715e 100644 --- a/src/test/compile-fail/unboxed-closure-sugar-used-on-struct.rs +++ b/src/test/compile-fail/unboxed-closure-sugar-used-on-struct.rs @@ -15,7 +15,7 @@ struct Bar<A,R> { } fn foo(b: Box<Bar()>) { - //~^ ERROR E0169 + //~^ ERROR parenthesized parameters may only be used with a trait } fn main() { } |