Skip to content

Fix some spelling errors. #20001

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 23, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/libstd/ascii.rs
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ impl Ascii {
self.chr
}

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

/// Deprecated: use `as_char` isntead.
/// Deprecated: use `as_char` instead.
#[deprecated = "use as_char"]
pub fn to_char(self) -> char {
self.as_char()
Expand Down
4 changes: 2 additions & 2 deletions src/libstd/comm/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -547,7 +547,7 @@ impl<T: Send> Sender<T> {
/// so it is possible for a send to succeed (the other end is alive), but
/// then the other end could immediately disconnect.
///
/// The purpose of this functionality is to propagate panicks among tasks.
/// The purpose of this functionality is to propagate panics among tasks.
/// If a panic is not desired, then consider using the `send_opt` method
#[experimental = "this function is being considered candidate for removal \
to adhere to the general guidelines of rust"]
Expand Down Expand Up @@ -790,7 +790,7 @@ impl<T: Send> Receiver<T> {
///
/// Similar to channels, this method will trigger a task panic if the
/// other end of the channel has hung up (been deallocated). The purpose of
/// this is to propagate panicks among tasks.
/// this is to propagate panics among tasks.
///
/// If a panic is not desired, then there are two options:
///
Expand Down
6 changes: 3 additions & 3 deletions src/libstd/io/net/ip.rs
Original file line number Diff line number Diff line change
Expand Up @@ -383,8 +383,8 @@ impl FromStr for SocketAddr {
/// expected by its `FromStr` implementation or a string like `<host_name>:<port>` pair
/// where `<port>` is a `u16` value.
///
/// For the former, `to_socker_addr_all` returns a vector with a single element corresponding
/// to that socker address.
/// For the former, `to_socket_addr_all` returns a vector with a single element corresponding
/// to that socket address.
///
/// For the latter, it tries to resolve the host name and returns a vector of all IP addresses
/// for the host name, each joined with the port.
Expand Down Expand Up @@ -443,7 +443,7 @@ pub trait ToSocketAddr {

/// Converts this object to all available socket address values.
///
/// Some values like host name string naturally corrrespond to multiple IP addresses.
/// Some values like host name string naturally correspond to multiple IP addresses.
/// This method tries to return all available addresses corresponding to this object.
///
/// By default this method delegates to `to_socket_addr` method, creating a singleton
Expand Down
2 changes: 1 addition & 1 deletion src/libstd/io/net/tcp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ impl TcpListener {
/// to this listener. The port allocated can be queried via the
/// `socket_name` function.
///
/// The address type can be any implementor of `ToSocketAddr` trait. See its
/// The address type can be any implementer of `ToSocketAddr` trait. See its
/// documentation for concrete examples.
pub fn bind<A: ToSocketAddr>(addr: A) -> IoResult<TcpListener> {
super::with_addresses(addr, |addr| {
Expand Down
2 changes: 1 addition & 1 deletion src/libstd/io/net/udp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ impl UdpSocket {
/// Sends data on the socket to the given address. Returns nothing on
/// success.
///
/// Address type can be any implementor of `ToSocketAddr` trait. See its
/// Address type can be any implementer of `ToSocketAddr` trait. See its
/// documentation for concrete examples.
pub fn send_to<A: ToSocketAddr>(&mut self, buf: &[u8], addr: A) -> IoResult<()> {
super::with_addresses(addr, |addr| self.inner.send_to(buf, addr))
Expand Down
2 changes: 1 addition & 1 deletion src/libstd/sync/rwlock.rs
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ pub struct RWLock<T> {
data: UnsafeCell<T>,
}

/// Structure representing a staticaly allocated RWLock.
/// Structure representing a statically allocated RWLock.
///
/// This structure is intended to be used inside of a `static` and will provide
/// automatic global access as well as lazy initialization. The internal
Expand Down
2 changes: 1 addition & 1 deletion src/libstd/thread_local/scoped.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
//!
//! There are no restrictions on what types can be placed into a scoped
//! variable, but all scoped variables are initialized to the equivalent of
//! null. Scoped thread local stor is useful when a value is present for a known
//! null. Scoped thread local storage is useful when a value is present for a known
//! period of time and it is not required to relinquish ownership of the
//! contents.
//!
Expand Down