std: Stabilize the net module
#23352
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This commit performs a stabilization pass over the std::net module,
incorporating the changes from RFC 923. Specifically, the following actions were
taken:
Stable functionality:
* `net` (the name)
* `Shutdown`
* `Shutdown::{Read, Write, Both}`
* `lookup_host`
* `LookupHost`
* `SocketAddr`
* `SocketAddr::{V4, V6}`
* `SocketAddr::port`
* `SocketAddrV4`
* `SocketAddrV4::{new, ip, port}`
* `SocketAddrV6`
* `SocketAddrV4::{new, ip, port, flowinfo, scope_id}`
* Common trait impls for socket addr structures
* `ToSocketAddrs`
* `ToSocketAddrs::Iter`
* `ToSocketAddrs::to_socket_addrs`
* `ToSocketAddrs for {SocketAddr*, (Ipv*Addr, u16), str, (str, u16)}`
* `Ipv4Addr`
* `Ipv4Addr::{new, octets, to_ipv6_compatible, to_ipv6_mapped}`
* `Ipv6Addr`
* `Ipv6Addr::{new, segments, to_ipv4}`
* `TcpStream`
* `TcpStream::connect`
* `TcpStream::{peer_addr, local_addr, shutdown, try_clone}`
* `{Read,Write} for {TcpStream, &TcpStream}`
* `TcpListener`
* `TcpListener::bind`
* `TcpListener::{local_addr, try_clone, accept, incoming}`
* `Incoming`
* `UdpSocket`
* `UdpSocket::bind`
* `UdpSocket::{recv_from, send_to, local_addr, try_clone}`
Unstable functionality:
* Extra methods on `Ipv{4,6}Addr` for various methods of inspecting the address
and determining qualities of it.
* Extra methods on `TcpStream` to configure various protocol options.
* Extra methods on `UdpSocket` to configure various protocol options.
Deprecated functionality:
* The `socket_addr` method has been renamed to `local_addr`
This commit is a breaking change due to the restructuring of the `SocketAddr`
type as well as the renaming of the `socket_addr` method. Migration should be
fairly straightforward, however, after accounting for the new level of
abstraction in `SocketAddr` (protocol distinction at the socket address level,
not the IP address).
[breaking-change]
|
r? @brson (rust_highfive has picked a reviewer for you, use r? to override) |
|
Note that this should not be merged before rust-lang/rfcs#923 is decided on. r? @aturon |
|
cc @sfackler |
| #[stable(feature = "rust1", since = "1.0.0")] | ||
| pub fn ip(&self) -> &Ipv4Addr { | ||
| unsafe { | ||
| &*(&self.inner.sin_addr as *const libc::in_addr as *const Ipv4Addr) |
There was a problem hiding this comment.
Yes unfortunately I wasn't sure of a great way to do this otherwise. Given a type definition of struct T(U) I don't think we have a safe way to go from &U to &T, although it should indeed work out in terms of representation.
|
This LGTM. r=me once the RFC is accepted. |
bors
added a commit
that referenced
this pull request
Mar 17, 2015
This commit performs a stabilization pass over the std::net module,
incorporating the changes from RFC 923. Specifically, the following actions were
taken:
Stable functionality:
* `net` (the name)
* `Shutdown`
* `Shutdown::{Read, Write, Both}`
* `lookup_host`
* `LookupHost`
* `SocketAddr`
* `SocketAddr::{V4, V6}`
* `SocketAddr::port`
* `SocketAddrV4`
* `SocketAddrV4::{new, ip, port}`
* `SocketAddrV6`
* `SocketAddrV4::{new, ip, port, flowinfo, scope_id}`
* Common trait impls for socket addr structures
* `ToSocketAddrs`
* `ToSocketAddrs::Iter`
* `ToSocketAddrs::to_socket_addrs`
* `ToSocketAddrs for {SocketAddr*, (Ipv*Addr, u16), str, (str, u16)}`
* `Ipv4Addr`
* `Ipv4Addr::{new, octets, to_ipv6_compatible, to_ipv6_mapped}`
* `Ipv6Addr`
* `Ipv6Addr::{new, segments, to_ipv4}`
* `TcpStream`
* `TcpStream::connect`
* `TcpStream::{peer_addr, local_addr, shutdown, try_clone}`
* `{Read,Write} for {TcpStream, &TcpStream}`
* `TcpListener`
* `TcpListener::bind`
* `TcpListener::{local_addr, try_clone, accept, incoming}`
* `Incoming`
* `UdpSocket`
* `UdpSocket::bind`
* `UdpSocket::{recv_from, send_to, local_addr, try_clone}`
Unstable functionality:
* Extra methods on `Ipv{4,6}Addr` for various methods of inspecting the address
and determining qualities of it.
* Extra methods on `TcpStream` to configure various protocol options.
* Extra methods on `UdpSocket` to configure various protocol options.
Deprecated functionality:
* The `socket_addr` method has been renamed to `local_addr`
This commit is a breaking change due to the restructuring of the `SocketAddr`
type as well as the renaming of the `socket_addr` method. Migration should be
fairly straightforward, however, after accounting for the new level of
abstraction in `SocketAddr` (protocol distinction at the socket address level,
not the IP address).
[breaking-change]
# for free
to join this conversation on GitHub.
Already have an account?
# to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This commit performs a stabilization pass over the std::net module,
incorporating the changes from RFC 923. Specifically, the following actions were
taken:
Stable functionality:
net(the name)ShutdownShutdown::{Read, Write, Both}lookup_hostLookupHostSocketAddrSocketAddr::{V4, V6}SocketAddr::portSocketAddrV4SocketAddrV4::{new, ip, port}SocketAddrV6SocketAddrV4::{new, ip, port, flowinfo, scope_id}ToSocketAddrsToSocketAddrs::IterToSocketAddrs::to_socket_addrsToSocketAddrs for {SocketAddr*, (Ipv*Addr, u16), str, (str, u16)}Ipv4AddrIpv4Addr::{new, octets, to_ipv6_compatible, to_ipv6_mapped}Ipv6AddrIpv6Addr::{new, segments, to_ipv4}TcpStreamTcpStream::connectTcpStream::{peer_addr, local_addr, shutdown, try_clone}{Read,Write} for {TcpStream, &TcpStream}TcpListenerTcpListener::bindTcpListener::{local_addr, try_clone, accept, incoming}IncomingUdpSocketUdpSocket::bindUdpSocket::{recv_from, send_to, local_addr, try_clone}Unstable functionality:
Ipv{4,6}Addrfor various methods of inspecting the addressand determining qualities of it.
TcpStreamto configure various protocol options.UdpSocketto configure various protocol options.Deprecated functionality:
socket_addrmethod has been renamed tolocal_addrThis commit is a breaking change due to the restructuring of the
SocketAddrtype as well as the renaming of the
socket_addrmethod. Migration should befairly straightforward, however, after accounting for the new level of
abstraction in
SocketAddr(protocol distinction at the socket address level,not the IP address).
[breaking-change]