diff options
| author | bors <bors@rust-lang.org> | 2014-07-03 21:46:47 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-07-03 21:46:47 +0000 |
| commit | 5d5c20647f45f2eb74f337e5434bbe63b0c43345 (patch) | |
| tree | 155aab01cbadfe647f739c31ce46b29b792ea7ae /src/libstd/io | |
| parent | dd812ccbb56193c36819993dea25912788b447f0 (diff) | |
| parent | 9bd6479912990046947913f160f69bc550dd3817 (diff) | |
| download | rust-5d5c20647f45f2eb74f337e5434bbe63b0c43345.tar.gz rust-5d5c20647f45f2eb74f337e5434bbe63b0c43345.zip | |
auto merge of #15377 : alexcrichton/rust/rollup, r=alexcrichton
Closes #15276 (Guide: if) Closes #15280 (std::os - Add join_paths, make setenv non-utf8 capable) Closes #15314 (Guide: functions) Closes #15327 (Simplify PatIdent to contain an Ident rather than a Path) Closes #15340 (Guide: add mutable binding section) Closes #15342 (Fix ICE with nested macro_rules!-style macros) Closes #15350 (Remove duplicated slash in install script path) Closes #15351 (correct a few spelling mistakes in the tutorial) Closes #15352 (librustc: Have the kind checker check sub-bounds in trait casts.) Closes #15359 (Fix spelling errors.) Closes #15361 (Rename set_broadast() to set_broadcast().) Closes #15366 (Simplify creating a parser from a token tree) Closes #15367 (Add examples for StrVector methods) Closes #15372 (Vec::grow should use reserve_additional, Vec::reserve should check against capacity) Closes #15373 (Fix minor issues in the documentation of libtime.)
Diffstat (limited to 'src/libstd/io')
| -rw-r--r-- | src/libstd/io/net/ip.rs | 2 | ||||
| -rw-r--r-- | src/libstd/io/net/udp.rs | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/libstd/io/net/ip.rs b/src/libstd/io/net/ip.rs index 2c54bd895e9..ca59849202b 100644 --- a/src/libstd/io/net/ip.rs +++ b/src/libstd/io/net/ip.rs @@ -410,7 +410,7 @@ mod test { // colon after v4 let none: Option<IpAddr> = FromStr::from_str("::127.0.0.1:"); assert_eq!(None, none); - // not enought groups + // not enough groups let none: Option<IpAddr> = FromStr::from_str("1.2.3.4.5:127.0.0.1"); assert_eq!(None, none); // too many groups diff --git a/src/libstd/io/net/udp.rs b/src/libstd/io/net/udp.rs index cd78898d46b..21903eb2643 100644 --- a/src/libstd/io/net/udp.rs +++ b/src/libstd/io/net/udp.rs @@ -165,7 +165,7 @@ impl UdpSocket { /// Sets the broadcast flag on or off #[experimental] - pub fn set_broadast(&mut self, broadcast: bool) -> IoResult<()> { + pub fn set_broadcast(&mut self, broadcast: bool) -> IoResult<()> { if broadcast { self.obj.hear_broadcasts() } else { @@ -173,6 +173,12 @@ impl UdpSocket { }.map_err(IoError::from_rtio_error) } + /// Sets the broadcast flag on or off + #[deprecated="renamed to `set_broadcast`"] + pub fn set_broadast(&mut self, broadcast: bool) -> IoResult<()> { + self.set_broadcast(broadcast) + } + /// Sets the read/write timeout for this socket. /// /// For more information, see `TcpStream::set_timeout` |