diff options
| author | Manish Goregaokar <manishsmail@gmail.com> | 2016-10-04 15:24:02 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-04 15:24:02 +0530 |
| commit | d25aeb0ef1c4472e853eb9f3bc0acef7bf9a6536 (patch) | |
| tree | d1631833677beed85553dd2e0a1cacc5ed104acf /src/libstd/net | |
| parent | e39a78a28ce7a66944f08c3cd12c0be0282d4827 (diff) | |
| parent | 06a7dcd35588c0dd6eaa0a523b30e4140ff79868 (diff) | |
| download | rust-d25aeb0ef1c4472e853eb9f3bc0acef7bf9a6536.tar.gz rust-d25aeb0ef1c4472e853eb9f3bc0acef7bf9a6536.zip | |
Rollup merge of #36902 - ollie27:stab_impls, r=alexcrichton
std: Correct stability attributes for some implementations These are displayed by rustdoc so should be correct.
Diffstat (limited to 'src/libstd/net')
| -rw-r--r-- | src/libstd/net/ip.rs | 3 | ||||
| -rw-r--r-- | src/libstd/net/parser.rs | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/libstd/net/ip.rs b/src/libstd/net/ip.rs index ba2cd70e0d7..2030a61f60f 100644 --- a/src/libstd/net/ip.rs +++ b/src/libstd/net/ip.rs @@ -277,8 +277,7 @@ impl Ipv4Addr { } } -#[stable(feature = "rust1", since = "1.0.0")] -#[allow(deprecated)] +#[stable(feature = "ip_addr", since = "1.7.0")] impl fmt::Display for IpAddr { fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result { match *self { diff --git a/src/libstd/net/parser.rs b/src/libstd/net/parser.rs index ed4af471f2f..d86711c10ac 100644 --- a/src/libstd/net/parser.rs +++ b/src/libstd/net/parser.rs @@ -302,7 +302,7 @@ impl<'a> Parser<'a> { } } -#[stable(feature = "rust1", since = "1.0.0")] +#[stable(feature = "ip_addr", since = "1.7.0")] impl FromStr for IpAddr { type Err = AddrParseError; fn from_str(s: &str) -> Result<IpAddr, AddrParseError> { |