---

GuillaumeGomez · GuillaumeGomez · commit cb147a609258 · 2015-06-19T14:06:33.000+02:00
yaml --- r: 227643 b: refs/heads/try c: 9679faa h: refs/heads/master i: 227641: 1d75250 227639: d69a2d8 v: v3
diff --git a/[refs] b/[refs]
@@ -1,7 +1,7 @@
 ---
 refs/heads/master: aca2057ed5fb7af3f8905b2bc01f72fa001c35c8
 refs/heads/snap-stage3: 1af31d4974e33027a68126fa5a5a3c2c6491824f
-refs/heads/try: 2015eb881e8d9e82c1a889595c5b7b33440b2ae7
+refs/heads/try: 9679faa97afbdb9738df16b81175b7090915897f
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
diff --git a/branches/try/src/librustc_typeck/diagnostics.rs b/branches/try/src/librustc_typeck/diagnostics.rs
@@ -1464,9 +1464,6 @@ For more information see the [opt-in builtin traits RFC](https://github.com/rust
 }
 
 register_diagnostics! {
-    E0034, // multiple applicable methods in scope
-    E0035, // does not take type parameters
-    E0036, // incorrect number of type parameters given for this method
     E0044, // foreign items may not have type parameters
     E0045, // variadic function must have C calling convention
     E0068,

Original file line number	Diff line number	Diff line change
`@@ -1464,9 +1464,6 @@ For more information see the [opt-in builtin traits RFC](https://github.com/rust`
`1464`	`1464`	`}`
`1465`	`1465`
`1466`	`1466`	`register_diagnostics! {`
`1467`		`- E0034, // multiple applicable methods in scope`
`1468`		`- E0035, // does not take type parameters`
`1469`		`- E0036, // incorrect number of type parameters given for this method`
`1470`	`1467`	`E0044, // foreign items may not have type parameters`
`1471`	`1468`	`E0045, // variadic function must have C calling convention`
`1472`	`1469`	`E0068,`