---

yaml
---
r: 274165
b: refs/heads/stable
c: 365deeb
h: refs/heads/master
i:
  274163: 44a2131

Author: dirk

[refs]

@@ -29,7 +29,7 @@ refs/heads/tmp: e06d2ad9fcd5027bcaac5b08fc9aa39a49d0ecd3
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: c0221c8897db309a79990367476177b1230bb264
 refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
-refs/heads/stable: 49e27f1c5f2415b01101f3c1201ebe9f37b8aaa3
+refs/heads/stable: 365deeb19a2cff74e3d215622b1ab411581b99e9
 refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
 refs/tags/1.1.0: bc3c16f09287e5545c1d3f76b7abd54f2eca868b
 refs/tags/1.2.0: f557861f822c34f07270347b94b5280de20a597e

branches/stable/src/libstd/error.rs

@@ -185,7 +185,7 @@ impl Error for string::FromUtf16Error {
 #[stable(feature = "str_parse_error2", since = "1.8.0")]
 impl Error for string::ParseError {
     fn description(&self) -> &str {
-        "parse error"
+        match *self {}
     }
 }