Stop using diagnostics to avoid merge conflicts.

Author: nikomatsakis

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
 )

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())
         }
     };

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);
             }

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() { }

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() { }