diff options
| author | bors <bors@rust-lang.org> | 2016-02-10 01:05:42 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-02-10 01:05:42 +0000 |
| commit | 05427457680eb41b86b98101b8f037825b46458c (patch) | |
| tree | 10b2313a15883e6b6245f1f5c83e8f4ef4ccadb1 /src/libstd/net/parser.rs | |
| parent | 32b2ef7add2836cba5867d2e5ac9610cef416447 (diff) | |
| parent | 2067c570fb37623abc6effc3752a682795dfc83e (diff) | |
| download | rust-05427457680eb41b86b98101b8f037825b46458c.tar.gz rust-05427457680eb41b86b98101b8f037825b46458c.zip | |
Auto merge of #31438 - aturon:stab-ip-addr, r=alexcrichton
After [considerable pushback](https://github.com/rust-lang/rfcs/issues/1451), it's clear that there is a community consensus around providing `IpAddr` in the standard library, together with other APIs using it. This commit reverts from deprecated status directly to stable. The deprecation landed in 1.6, which has already been released, so the stabilization is marked for 1.7 (currently in beta; will require a backport). r? @alexcrichton
Diffstat (limited to 'src/libstd/net/parser.rs')
| -rw-r--r-- | src/libstd/net/parser.rs | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/libstd/net/parser.rs b/src/libstd/net/parser.rs index 91401c8e4fd..46a0309dbb5 100644 --- a/src/libstd/net/parser.rs +++ b/src/libstd/net/parser.rs @@ -17,7 +17,6 @@ use prelude::v1::*; use error::Error; use fmt; -#[allow(deprecated)] use net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr, SocketAddrV4, SocketAddrV6}; use str::FromStr; @@ -262,7 +261,6 @@ impl<'a> Parser<'a> { self.read_atomically(|p| p.read_ipv6_addr_impl()) } - #[allow(deprecated)] fn read_ip_addr(&mut self) -> Option<IpAddr> { let ipv4_addr = |p: &mut Parser| p.read_ipv4_addr().map(IpAddr::V4); let ipv6_addr = |p: &mut Parser| p.read_ipv6_addr().map(IpAddr::V6); @@ -308,7 +306,6 @@ impl<'a> Parser<'a> { } #[stable(feature = "rust1", since = "1.0.0")] -#[allow(deprecated)] impl FromStr for IpAddr { type Err = AddrParseError; fn from_str(s: &str) -> Result<IpAddr, AddrParseError> { |
