diff options
| author | bors <bors@rust-lang.org> | 2015-04-11 18:31:59 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-04-11 18:31:59 +0000 |
| commit | 6790b0e51967b1487728d155e0800a1ed03a30d3 (patch) | |
| tree | 51c11cb951751d408b68c401a487c5f2fbe26157 /src/libstd | |
| parent | 67a8f61730418768f07d8ed0f9735a31d0c5d84d (diff) | |
| parent | 0a2885ad944aa1a5f60a72a7551b1b45367637f6 (diff) | |
| download | rust-6790b0e51967b1487728d155e0800a1ed03a30d3.tar.gz rust-6790b0e51967b1487728d155e0800a1ed03a30d3.zip | |
Auto merge of #24328 - Manishearth:rollup, r=Manishearth
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/collections/hash/map.rs | 2 | ||||
| -rw-r--r-- | src/libstd/sync/mpsc/mod.rs | 4 | ||||
| -rw-r--r-- | src/libstd/thread/mod.rs | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/libstd/collections/hash/map.rs b/src/libstd/collections/hash/map.rs index a636c1a812d..54a3a055768 100644 --- a/src/libstd/collections/hash/map.rs +++ b/src/libstd/collections/hash/map.rs @@ -1107,7 +1107,7 @@ impl<K, V, S> HashMap<K, V, S> self.search_mut(k).map(|bucket| bucket.into_mut_refs().1) } - /// Inserts a key-value pair from the map. If the key already had a value + /// Inserts a key-value pair into the map. If the key already had a value /// present in the map, that value is returned. Otherwise, `None` is returned. /// /// # Examples diff --git a/src/libstd/sync/mpsc/mod.rs b/src/libstd/sync/mpsc/mod.rs index e5444843516..93b27b6ce9e 100644 --- a/src/libstd/sync/mpsc/mod.rs +++ b/src/libstd/sync/mpsc/mod.rs @@ -345,8 +345,8 @@ pub struct SendError<T>(#[stable(feature = "rust1", since = "1.0.0")] pub T); #[stable(feature = "rust1", since = "1.0.0")] pub struct RecvError; -/// This enumeration is the list of the possible reasons that try_recv could not -/// return data when called. +/// This enumeration is the list of the possible reasons that `try_recv` could +/// not return data when called. #[derive(PartialEq, Eq, Clone, Copy, Debug)] #[stable(feature = "rust1", since = "1.0.0")] pub enum TryRecvError { diff --git a/src/libstd/thread/mod.rs b/src/libstd/thread/mod.rs index 10c79671c0c..f893ae243bb 100644 --- a/src/libstd/thread/mod.rs +++ b/src/libstd/thread/mod.rs @@ -367,7 +367,7 @@ impl Builder { /// /// # Panics /// -/// Panicks if the OS fails to create a thread; use `Builder::spawn` +/// Panics if the OS fails to create a thread; use `Builder::spawn` /// to recover from such errors. #[stable(feature = "rust1", since = "1.0.0")] pub fn spawn<F>(f: F) -> JoinHandle where F: FnOnce(), F: Send + 'static { @@ -385,7 +385,7 @@ pub fn spawn<F>(f: F) -> JoinHandle where F: FnOnce(), F: Send + 'static { /// /// # Panics /// -/// Panicks if the OS fails to create a thread; use `Builder::scoped` +/// Panics if the OS fails to create a thread; use `Builder::scoped` /// to recover from such errors. #[stable(feature = "rust1", since = "1.0.0")] pub fn scoped<'a, T, F>(f: F) -> JoinGuard<'a, T> where |