---

GuillaumeGomez · GuillaumeGomez · commit 73a1e95d14eb · 2015-06-19T14:06:33.000+02:00
yaml --- r: 225981 b: refs/heads/stable c: 9679faa h: refs/heads/master i: 225979: 41900c1 v: v3
diff --git a/[refs] b/[refs]
@@ -29,6 +29,6 @@ refs/heads/tmp: e5d90d98402475b6e154ce216f9efcb80da1a747
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: 1fe32ca12c51afcd761d9962f51a74ff0d07a591
 refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
-refs/heads/stable: 2015eb881e8d9e82c1a889595c5b7b33440b2ae7
+refs/heads/stable: 9679faa97afbdb9738df16b81175b7090915897f
 refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
 refs/tags/1.1.0: bc3c16f09287e5545c1d3f76b7abd54f2eca868b
diff --git a/branches/stable/src/librustc_typeck/diagnostics.rs b/branches/stable/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,`