diff --git a/src/librustc/diagnostics.rs b/src/librustc/diagnostics.rs
index dd5cb8e3b4d242bfa19ed8c776acebdeee785aad..fcac718b3708cbf1576ff7ddf4979975563104d3 100644
--- a/src/librustc/diagnostics.rs
+++ b/src/librustc/diagnostics.rs
@@ -67,6 +67,5 @@
     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 4ea2a2287019db090be67526142bf7ee3fcd6ff3..762aed3dfa8ea5504cc848ce1e40c232e11ed30a 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 37147eb8a87a839b69633f66957ba56e364fd96a..fdc57579d072bebf88bf139e8c28c2533194c979 100644
--- a/src/librustc_typeck/check/mod.rs
+++ b/src/librustc_typeck/check/mod.rs
@@ -5143,8 +5143,9 @@ fn push_explicit_parameters_from_segment_to_substs<'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 2c1dee36b9a78b24fc282aedf706c25d544dd44b..a6184caf68b1f9ebb12da83bcb0bad003d3942b2 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 db94127a9ea18ce8a8d42a933df6f6d180d4d74b..d5fb505715e90e046b9671474dbb6e62aa9735fc 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() { }