---

sfackler · sfackler · commit 1fafbe7fd75a · 2015-08-24T08:59:45.000-07:00
yaml --- r: 233669 b: refs/heads/beta c: f266f12 h: refs/heads/master i: 233667: ba6adfc v: v3
diff --git a/[refs] b/[refs]
@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
 refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
 refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
 refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
-refs/heads/beta: b61fddebb09f33c52cf97f66c797f8d5401096ec
+refs/heads/beta: f266f12f3066c02cfef6116202e624443f919dff
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: 370fe2786109360f7c35b8ba552b83b773dd71d6
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
diff --git a/branches/beta/src/libstd/net/parser.rs b/branches/beta/src/libstd/net/parser.rs
@@ -342,12 +342,14 @@ impl FromStr for SocketAddr {
 #[derive(Debug, Clone, PartialEq)]
 pub struct AddrParseError(());
 
+#[stable(feature = "addr_parse_error_error", since = "1.4.0")]
 impl fmt::Display for AddrParseError {
     fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
         fmt.write_str(self.description())
     }
 }
 
+#[stable(feature = "addr_parse_error_error", since = "1.4.0")]
 impl Error for AddrParseError {
     fn description(&self) -> &str {
         "invalid IP address syntax"

Original file line number	Diff line number	Diff line change
`@@ -342,12 +342,14 @@ impl FromStr for SocketAddr {`
`342`	`342`	`#[derive(Debug, Clone, PartialEq)]`
`343`	`343`	`pub struct AddrParseError(());`
`344`	`344`
	`345`	`+#[stable(feature = "addr_parse_error_error", since = "1.4.0")]`
`345`	`346`	`impl fmt::Display for AddrParseError {`
`346`	`347`	`fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {`
`347`	`348`	`fmt.write_str(self.description())`
`348`	`349`	`}`
`349`	`350`	`}`
`350`	`351`
	`352`	`+#[stable(feature = "addr_parse_error_error", since = "1.4.0")]`
`351`	`353`	`impl Error for AddrParseError {`
`352`	`354`	`fn description(&self) -> &str {`
`353`	`355`	`"invalid IP address syntax"`