---

yaml
---
r: 164835
b: refs/heads/try
c: f6d60f3
h: refs/heads/master
i:
  164833: 3041520
  164831: 6be8718
v: v3

Author: nikomatsakis

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: f8f2c7a9537c7f333b242f616aefb75a83860927
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 8443b09e361b96d1f9b7f45a65ed0d31c0e86e70
-refs/heads/try: 840ce00a9b056e5ed16eb735d0758dbaa7c2c8f4
+refs/heads/try: f6d60f32080314f1167dd3efb13d772528f500f0
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try/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
 )

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

branches/try/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);
             }

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

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