rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

rollup merge of #24377: apasel422/docs

Browse Source 
Conflicts:
	src/libstd/net/ip.rs
	src/libstd/sys/unix/fs.rs
	src/libstd/sys/unix/mod.rs
	src/libstd/sys/windows/mod.rs
This commit is contained in:
Alex Crichton
2015-04-14 10:56:57 -07:00
parent 7913f5659d 6fa16d6a47
commit ae7959d298
63 changed files with 377 additions and 377 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/libstd/net/ip.rs
View File

@@ -58,7 +58,7 @@ pub enum Ipv6MulticastScope {
}
impl Ipv4Addr {
/// Create a new IPv4 address from four eight-bit octets.
/// Creates a new IPv4 address from four eight-bit octets.
///
/// The result will represent the IP address a.b.c.d
#[stable(feature = "rust1", since = "1.0.0")]
@@ -152,7 +152,7 @@ impl Ipv4Addr {
}
}
/// Convert this address to an IPv4-compatible IPv6 address
/// Converts this address to an IPv4-compatible IPv6 address
///
/// a.b.c.d becomes ::a.b.c.d
#[stable(feature = "rust1", since = "1.0.0")]
@@ -162,7 +162,7 @@ impl Ipv4Addr {
((self.octets()[2] as u16) << 8) | self.octets()[3] as u16)
}
/// Convert this address to an IPv4-mapped IPv6 address
/// Converts this address to an IPv4-mapped IPv6 address
///
/// a.b.c.d becomes ::ffff:a.b.c.d
#[stable(feature = "rust1", since = "1.0.0")]
@@ -245,7 +245,7 @@ impl FromInner<libc::in_addr> for Ipv4Addr {
}
impl Ipv6Addr {
/// Create a new IPv6 address from eight 16-bit segments.
/// Creates a new IPv6 address from eight 16-bit segments.
///
/// The result will represent the IP address a:b:c:d:e:f:g:h
#[stable(feature = "rust1", since = "1.0.0")]
@@ -259,7 +259,7 @@ impl Ipv6Addr {
}
}
/// Return the eight 16-bit segments that make up this address
/// Returns the eight 16-bit segments that make up this address
#[stable(feature = "rust1", since = "1.0.0")]
pub fn segments(&self) -> [u16; 8] {
[ntoh(self.inner.s6_addr[0]),
@@ -349,7 +349,7 @@ impl Ipv6Addr {
(self.segments()[0] & 0xff00) == 0xff00
}
/// Convert this address to an IPv4 address. Returns None if this address is
/// Converts this address to an IPv4 address. Returns None if this address is
/// neither IPv4-compatible or IPv4-mapped.
///
/// ::a.b.c.d and ::ffff:a.b.c.d become a.b.c.d