Skip to content

Commit 65b156b

Browse files
committed
Merge pull request #20001 from huonw/speeling2
Fix some spelling errors. Reviewed-by: nick29581
2 parents ce36e24 + 832c3e3 commit 65b156b

File tree

7 files changed

+11
-11
lines changed

7 files changed

+11
-11
lines changed

src/libstd/ascii.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ impl Ascii {
3939
self.chr
4040
}
4141

42-
/// Deprecated: use `as_byte` isntead.
42+
/// Deprecated: use `as_byte` instead.
4343
#[deprecated = "use as_byte"]
4444
pub fn to_byte(self) -> u8 {
4545
self.as_byte()
@@ -52,7 +52,7 @@ impl Ascii {
5252
self.chr as char
5353
}
5454

55-
/// Deprecated: use `as_char` isntead.
55+
/// Deprecated: use `as_char` instead.
5656
#[deprecated = "use as_char"]
5757
pub fn to_char(self) -> char {
5858
self.as_char()

src/libstd/comm/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -547,7 +547,7 @@ impl<T: Send> Sender<T> {
547547
/// so it is possible for a send to succeed (the other end is alive), but
548548
/// then the other end could immediately disconnect.
549549
///
550-
/// The purpose of this functionality is to propagate panicks among tasks.
550+
/// The purpose of this functionality is to propagate panics among tasks.
551551
/// If a panic is not desired, then consider using the `send_opt` method
552552
#[experimental = "this function is being considered candidate for removal \
553553
to adhere to the general guidelines of rust"]
@@ -790,7 +790,7 @@ impl<T: Send> Receiver<T> {
790790
///
791791
/// Similar to channels, this method will trigger a task panic if the
792792
/// other end of the channel has hung up (been deallocated). The purpose of
793-
/// this is to propagate panicks among tasks.
793+
/// this is to propagate panics among tasks.
794794
///
795795
/// If a panic is not desired, then there are two options:
796796
///

src/libstd/io/net/ip.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -383,8 +383,8 @@ impl FromStr for SocketAddr {
383383
/// expected by its `FromStr` implementation or a string like `<host_name>:<port>` pair
384384
/// where `<port>` is a `u16` value.
385385
///
386-
/// For the former, `to_socker_addr_all` returns a vector with a single element corresponding
387-
/// to that socker address.
386+
/// For the former, `to_socket_addr_all` returns a vector with a single element corresponding
387+
/// to that socket address.
388388
///
389389
/// For the latter, it tries to resolve the host name and returns a vector of all IP addresses
390390
/// for the host name, each joined with the port.
@@ -443,7 +443,7 @@ pub trait ToSocketAddr {
443443

444444
/// Converts this object to all available socket address values.
445445
///
446-
/// Some values like host name string naturally corrrespond to multiple IP addresses.
446+
/// Some values like host name string naturally correspond to multiple IP addresses.
447447
/// This method tries to return all available addresses corresponding to this object.
448448
///
449449
/// By default this method delegates to `to_socket_addr` method, creating a singleton

src/libstd/io/net/tcp.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ impl TcpListener {
319319
/// to this listener. The port allocated can be queried via the
320320
/// `socket_name` function.
321321
///
322-
/// The address type can be any implementor of `ToSocketAddr` trait. See its
322+
/// The address type can be any implementer of `ToSocketAddr` trait. See its
323323
/// documentation for concrete examples.
324324
pub fn bind<A: ToSocketAddr>(addr: A) -> IoResult<TcpListener> {
325325
super::with_addresses(addr, |addr| {

src/libstd/io/net/udp.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ impl UdpSocket {
8282
/// Sends data on the socket to the given address. Returns nothing on
8383
/// success.
8484
///
85-
/// Address type can be any implementor of `ToSocketAddr` trait. See its
85+
/// Address type can be any implementer of `ToSocketAddr` trait. See its
8686
/// documentation for concrete examples.
8787
pub fn send_to<A: ToSocketAddr>(&mut self, buf: &[u8], addr: A) -> IoResult<()> {
8888
super::with_addresses(addr, |addr| self.inner.send_to(buf, addr))

src/libstd/sync/rwlock.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ pub struct RWLock<T> {
6060
data: UnsafeCell<T>,
6161
}
6262

63-
/// Structure representing a staticaly allocated RWLock.
63+
/// Structure representing a statically allocated RWLock.
6464
///
6565
/// This structure is intended to be used inside of a `static` and will provide
6666
/// automatic global access as well as lazy initialization. The internal

src/libstd/thread_local/scoped.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
//!
1818
//! There are no restrictions on what types can be placed into a scoped
1919
//! variable, but all scoped variables are initialized to the equivalent of
20-
//! null. Scoped thread local stor is useful when a value is present for a known
20+
//! null. Scoped thread local storage is useful when a value is present for a known
2121
//! period of time and it is not required to relinquish ownership of the
2222
//! contents.
2323
//!

0 commit comments

Comments
 (0)