Skip to content

Commit 0b93a27

Browse files
authored
Rollup merge of rust-lang#104265 - faern:move-ipaddr-to-core, r=joshtriplett
Move IpAddr, SocketAddr and V4+V6 related types to `core` Implements RFC rust-lang/rfcs#2832. The RFC has completed FCP with disposition merge, but is not yet merged. Moves IP types to `core` as specified in the RFC. The full list of moved types is: `IpAddr`, `Ipv4Addr`, `Ipv6Addr`, `SocketAddr`, `SocketAddrV4`, `SocketAddrV6`, `Ipv6MulticastScope` and `AddrParseError`. Doing this move was one of the main driving arguments behind rust-lang#78802.
2 parents 33af22a + 1291216 commit 0b93a27

17 files changed

+4080
-3785
lines changed

library/core/src/lib.rs

+4
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,8 @@
124124
#![feature(const_inherent_unchecked_arith)]
125125
#![feature(const_int_unchecked_arith)]
126126
#![feature(const_intrinsic_forget)]
127+
#![feature(const_ipv4)]
128+
#![feature(const_ipv6)]
127129
#![feature(const_likely)]
128130
#![feature(const_maybe_uninit_uninit_array)]
129131
#![feature(const_maybe_uninit_as_mut_ptr)]
@@ -179,6 +181,7 @@
179181
#![feature(const_slice_index)]
180182
#![feature(const_is_char_boundary)]
181183
#![feature(const_cstr_methods)]
184+
#![feature(ip)]
182185
#![feature(is_ascii_octdigit)]
183186
//
184187
// Language features:
@@ -348,6 +351,7 @@ pub mod cell;
348351
pub mod char;
349352
pub mod ffi;
350353
pub mod iter;
354+
pub mod net;
351355
pub mod option;
352356
pub mod panic;
353357
pub mod panicking;
File renamed without changes.

0 commit comments

Comments
 (0)