---

sfackler · sfackler · commit 99f31efd4b45 · 2015-08-24T08:59:45.000-07:00
yaml --- r: 232670 b: refs/heads/try c: f266f12 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -1,7 +1,7 @@
 ---
 refs/heads/master: edeb4f1c86cbf6af8ef9874d4b3af50f721ea1b8
 refs/heads/snap-stage3: 1af31d4974e33027a68126fa5a5a3c2c6491824f
-refs/heads/try: b61fddebb09f33c52cf97f66c797f8d5401096ec
+refs/heads/try: f266f12f3066c02cfef6116202e624443f919dff
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
diff --git a/branches/try/src/libstd/net/parser.rs b/branches/try/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"`