diff options
| author | bors <bors@rust-lang.org> | 2016-01-18 00:58:21 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-01-18 00:58:21 +0000 |
| commit | d0bac3f1475503d044f50c5997c3d48d87675541 (patch) | |
| tree | 4a4a17e09391c5439d19d7426098c3c2533f0905 | |
| parent | 4ab9a2d1d6a5140c1968e59449442d3cc9006fdd (diff) | |
| parent | f09bcc10c6c41615dfed5d4e4e0380f448218649 (diff) | |
| download | rust-d0bac3f1475503d044f50c5997c3d48d87675541.tar.gz rust-d0bac3f1475503d044f50c5997c3d48d87675541.zip | |
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.
| -rw-r--r-- | src/libstd/net/addr.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libstd/net/addr.rs b/src/libstd/net/addr.rs index 7ae389615ac..9382793b8be 100644 --- a/src/libstd/net/addr.rs +++ b/src/libstd/net/addr.rs @@ -140,13 +140,13 @@ impl SocketAddrV6 { #[stable(feature = "rust1", since = "1.0.0")] pub fn port(&self) -> u16 { ntoh(self.inner.sin6_port) } - /// Returns scope ID associated with this address, corresponding to the - /// `sin6_flowinfo` field in C. + /// Returns the flow information associated with this address, + /// corresponding to the `sin6_flowinfo` field in C. #[stable(feature = "rust1", since = "1.0.0")] pub fn flowinfo(&self) -> u32 { ntoh(self.inner.sin6_flowinfo) } - /// Returns scope ID associated with this address, corresponding to the - /// `sin6_scope_id` field in C. + /// Returns the scope ID associated with this address, + /// corresponding to the `sin6_scope_id` field in C. #[stable(feature = "rust1", since = "1.0.0")] pub fn scope_id(&self) -> u32 { ntoh(self.inner.sin6_scope_id) } } |
