From 69f63e9c729962b9d5594cdff57a12ec15f3944d Mon Sep 17 00:00:00 2001 From: Corey Farwell Date: Thu, 9 Apr 2015 12:02:14 -0700 Subject: Indicate keyword in doc comment is code-like --- src/libstd/sync/mpsc/mod.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/libstd') 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(#[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 { -- cgit 1.4.1-3-g733a5 From 7bf1da1283874e0e968e76e95d2168c1624c2ce2 Mon Sep 17 00:00:00 2001 From: Andrew Paseltiner Date: Fri, 10 Apr 2015 12:42:36 -0400 Subject: s/Panicks/Panics/ --- src/libstd/thread/mod.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/libstd') diff --git a/src/libstd/thread/mod.rs b/src/libstd/thread/mod.rs index 5fe6e80d6e9..9d5f776d01f 100644 --- a/src/libstd/thread/mod.rs +++ b/src/libstd/thread/mod.rs @@ -368,7 +368,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) -> JoinHandle where F: FnOnce(), F: Send + 'static { @@ -386,7 +386,7 @@ pub fn spawn(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 -- cgit 1.4.1-3-g733a5 From 520ee34a66326638ddcb184ffd897ba492f99ba9 Mon Sep 17 00:00:00 2001 From: Tibor Benke Date: Fri, 10 Apr 2015 22:51:05 +0200 Subject: Fix some typos Signed-off-by: Tibor Benke --- src/libcollections/btree/map.rs | 2 +- src/libcollections/vec_map.rs | 2 +- src/libstd/collections/hash/map.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/libstd') diff --git a/src/libcollections/btree/map.rs b/src/libcollections/btree/map.rs index adfb284dabe..e704a956492 100644 --- a/src/libcollections/btree/map.rs +++ b/src/libcollections/btree/map.rs @@ -313,7 +313,7 @@ impl BTreeMap { // 2) While ODS may potentially return the pair we *just* inserted after // the split, we will never do this. Again, this shouldn't effect the analysis. - /// 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/libcollections/vec_map.rs b/src/libcollections/vec_map.rs index 8900c795045..3d9d8cf51ec 100644 --- a/src/libcollections/vec_map.rs +++ b/src/libcollections/vec_map.rs @@ -576,7 +576,7 @@ impl VecMap { } } - /// 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/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 HashMap 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 -- cgit 1.4.1-3-g733a5