Skip to content

Commit

Permalink
Rollup merge of #104265 - faern:move-ipaddr-to-core, r=joshtriplett
Browse files Browse the repository at this point in the history
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 #78802.
  • Loading branch information
matthiaskrgr authored Feb 27, 2023
2 parents 7d782b7 + 1291216 commit cf04603
Show file tree
Hide file tree
Showing 17 changed files with 4,080 additions and 3,785 deletions.
4 changes: 4 additions & 0 deletions library/core/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,8 @@
#![feature(const_inherent_unchecked_arith)]
#![feature(const_int_unchecked_arith)]
#![feature(const_intrinsic_forget)]
#![feature(const_ipv4)]
#![feature(const_ipv6)]
#![feature(const_likely)]
#![feature(const_maybe_uninit_uninit_array)]
#![feature(const_maybe_uninit_as_mut_ptr)]
Expand Down Expand Up @@ -179,6 +181,7 @@
#![feature(const_slice_index)]
#![feature(const_is_char_boundary)]
#![feature(const_cstr_methods)]
#![feature(ip)]
#![feature(is_ascii_octdigit)]
//
// Language features:
Expand Down Expand Up @@ -349,6 +352,7 @@ pub mod cell;
pub mod char;
pub mod ffi;
pub mod iter;
pub mod net;
pub mod option;
pub mod panic;
pub mod panicking;
Expand Down
File renamed without changes.
Loading

0 comments on commit cf04603

Please sign in to comment.