Auto merge of #30973 - SimonSapin:patch-16, r=alexcrichton

I don’t understand what the "flow information" of an IPv6 address is, but it looks separate from the scope ID. This was probably a copy/paste error.
This commit is contained in:
bors 2016-01-18 00:58:21 +00:00
commit d0bac3f147

View File

@ -140,13 +140,13 @@ pub fn ip(&self) -> &Ipv6Addr {
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
pub fn port(&self) -> u16 { ntoh(self.inner.sin6_port) } pub fn port(&self) -> u16 { ntoh(self.inner.sin6_port) }
/// Returns scope ID associated with this address, corresponding to the /// Returns the flow information associated with this address,
/// `sin6_flowinfo` field in C. /// corresponding to the `sin6_flowinfo` field in C.
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
pub fn flowinfo(&self) -> u32 { ntoh(self.inner.sin6_flowinfo) } pub fn flowinfo(&self) -> u32 { ntoh(self.inner.sin6_flowinfo) }
/// Returns scope ID associated with this address, corresponding to the /// Returns the scope ID associated with this address,
/// `sin6_scope_id` field in C. /// corresponding to the `sin6_scope_id` field in C.
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
pub fn scope_id(&self) -> u32 { ntoh(self.inner.sin6_scope_id) } pub fn scope_id(&self) -> u32 { ntoh(self.inner.sin6_scope_id) }
} }