---

yaml
---
r: 235796
b: refs/heads/stable
c: 688a099
h: refs/heads/master
v: v3

Author: Manishearth

[refs]

@@ -29,7 +29,7 @@ refs/heads/tmp: afae2ff723393b3ab4ccffef6ac7c6d1809e2da0
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: f859507de8c410b648d934d8f5ec1c52daac971d
 refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
-refs/heads/stable: 36d852918f5de255a706667af9373edea7429d3f
+refs/heads/stable: 688a09910a01800bfa031892540f29bb0c3b4095
 refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
 refs/tags/1.1.0: bc3c16f09287e5545c1d3f76b7abd54f2eca868b
 refs/tags/1.2.0: f557861f822c34f07270347b94b5280de20a597e

branches/stable/src/librustc/diagnostics.rs

@@ -72,7 +72,7 @@ fn foo(x: Option<String>) {
 E0003: r##"
 Not-a-Number (NaN) values cannot be compared for equality and hence can never
 match the input to a match expression. To match against NaN values, you should
-instead use the `is_nan()` method in a guard, like so: 
+instead use the `is_nan()` method in a guard, like so:
 
 ```
 match number {
@@ -96,21 +96,13 @@ underscore `_` wildcard pattern can be added after all other patterns to match
 "anything else".
 "##,
 
-// FIXME: Remove duplication here?
 E0005: r##"
 Patterns used to bind names must be irrefutable, that is, they must guarantee
 that a name will be extracted in all cases. If you encounter this error you
 probably need to use a `match` or `if let` to deal with the possibility of
 failure.
 "##,
 
-E0006: r##"
-Patterns used to bind names must be irrefutable, that is, they must guarantee
-that a name will be extracted in all cases. If you encounter this error you
-probably need to use a `match` or `if let` to deal with the possibility of
-failure.
-"##,
-
 E0007: r##"
 This error indicates that the bindings in a match arm would require a value to
 be moved into more than one location, thus violating unique ownership. Code like
@@ -1262,6 +1254,7 @@ contain references (with a maximum lifetime of `'a`).
 
 
 register_diagnostics! {
+    // E0006 // merged with E0005
     E0017,
     E0022,
     E0038,

branches/stable/src/librustc/middle/check_match.rs

@@ -1049,7 +1049,7 @@ fn check_fn(cx: &mut MatchCheckCtxt,
 
     for input in &decl.inputs {
         is_refutable(cx, &*input.pat, |pat| {
-            span_err!(cx.tcx.sess, input.pat.span, E0006,
+            span_err!(cx.tcx.sess, input.pat.span, E0005,
                 "refutable pattern in function argument: `{}` not covered",
                 pat_to_string(pat)
             );