diff options
| author | bors <bors@rust-lang.org> | 2018-03-26 18:41:38 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-03-26 18:41:38 +0000 |
| commit | 188e693b392116c46f746e86f8521f9621fcfd43 (patch) | |
| tree | 21205e49317c0c351e2ef53a584559a213e862b8 /src/libstd/net | |
| parent | ab8b961677ac5c74762dcea955aa0ff4d7fe4915 (diff) | |
| parent | 140bf949bf65bb0479dbe31bd3474d5546ef59e1 (diff) | |
| download | rust-188e693b392116c46f746e86f8521f9621fcfd43.tar.gz rust-188e693b392116c46f746e86f8521f9621fcfd43.zip | |
Auto merge of #49101 - mark-i-m:stabilize_i128, r=nagisa
Stabilize 128-bit integers :tada: cc #35118 EDIT: This should be merged only after the following have been merged: - [x] https://github.com/rust-lang-nursery/compiler-builtins/pull/236 - [x] https://github.com/rust-lang/book/pull/1230
Diffstat (limited to 'src/libstd/net')
| -rw-r--r-- | src/libstd/net/ip.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/net/ip.rs b/src/libstd/net/ip.rs index 031fae6d59b..25fa9095536 100644 --- a/src/libstd/net/ip.rs +++ b/src/libstd/net/ip.rs @@ -1355,7 +1355,7 @@ impl FromInner<c::in6_addr> for Ipv6Addr { } } -#[unstable(feature = "i128", issue = "35118")] +#[stable(feature = "i128", since = "1.26.0")] impl From<Ipv6Addr> for u128 { fn from(ip: Ipv6Addr) -> u128 { let ip = ip.segments(); @@ -1364,7 +1364,7 @@ impl From<Ipv6Addr> for u128 { ((ip[6] as u128) << 16) + (ip[7] as u128) } } -#[unstable(feature = "i128", issue = "35118")] +#[stable(feature = "i128", since = "1.26.0")] impl From<u128> for Ipv6Addr { fn from(ip: u128) -> Ipv6Addr { Ipv6Addr::new( |