rollup merge of #19038: jayelm/fixed-typos

Baby steps here...

Fixed some comments in liblog, libregex, librustc, libstd.

diff --git a/src/liblog/lib.rs b/src/liblog/lib.rs
index b626b66427df3580a56f926b7ffe37382db278d1..2e60ce31d5e5e7bc0b2ca24d0e2440ac1b5e54da 100644 (file)
--- a/src/liblog/lib.rs
+++ b/src/liblog/lib.rs
@@ -137,7 +137,7 @@
 //! includes 'foo'.
 //! * `info/f.o` turns on all info logging where the log message includes 'foo',
 //! 'f1o', 'fao', etc.
-//! * `hello=debug/foo*foo` turns on debug logging for 'hello' where the the log
+//! * `hello=debug/foo*foo` turns on debug logging for 'hello' where the log
 //! message includes 'foofoo' or 'fofoo' or 'fooooooofoo', etc.
 //! * `error,hello=warn/[0-9] scopes` turn on global error logging and also warn for
 //!  hello. In both cases the log message must include a single digit number

diff --git a/src/libregex/re.rs b/src/libregex/re.rs
index e1e2abcb1b7c540e011443e6959a8b86fa3e63b4..e70491a785c370b27ecb643153559eb1a3ece86b 100644 (file)
--- a/src/libregex/re.rs
+++ b/src/libregex/re.rs
@@ -561,7 +561,7 @@ fn next(&mut self) -> Option<Option<String>> {
 /// Replacer describes types that can be used to replace matches in a string.
 pub trait Replacer {
     /// Returns a possibly owned string that is used to replace the match
-    /// corresponding the the `caps` capture group.
+    /// corresponding to the `caps` capture group.
     ///
     /// The `'a` lifetime refers to the lifetime of a borrowed string when
     /// a new owned string isn't needed (e.g., for `NoExpand`).

diff --git a/src/librustc/middle/traits/select.rs b/src/librustc/middle/traits/select.rs
index 9ab2f948f9da20f23378f821698ccc294490fb43..edd37294b6a694e44dea3d7aa0a4bcc73d327cf0 100644 (file)
--- a/src/librustc/middle/traits/select.rs
+++ b/src/librustc/middle/traits/select.rs
@@ -351,7 +351,7 @@ fn evaluate_stack(&mut self,
         // matches this obligation, then we can assume that the
         // obligation is satisfied for now (still all other conditions
         // must be met of course). One obvious case this comes up is
-        // marker traits like `Send`. Think of a a linked list:
+        // marker traits like `Send`. Think of a linked list:
         //
         //    struct List<T> { data: T, next: Option<Box<List<T>>> {
         //

diff --git a/src/libstd/collections/hash/table.rs b/src/libstd/collections/hash/table.rs
index 76e15f7375c010c7f097f885d9d1b75e3789031c..f41ccea0aaf0370dff35ceb188edaa58b01f0893 100644 (file)
--- a/src/libstd/collections/hash/table.rs
+++ b/src/libstd/collections/hash/table.rs
@@ -718,7 +718,7 @@ fn next(&mut self) -> Option<RawBucket<K, V>> {
 }
 
 /// An iterator that moves out buckets in reverse order. It leaves the table
-/// in an an inconsistent state and should only be used for dropping
+/// in an inconsistent state and should only be used for dropping
 /// the table's remaining entries. It's used in the implementation of Drop.
 struct RevMoveBuckets<'a, K, V> {
     raw: RawBucket<K, V>,

diff --git a/src/libstd/os.rs b/src/libstd/os.rs
index f5aa2259f8d9cf9794f071aa1fa1251d88ae2dc9..be8e4695fa9433f396ae87b7e218c60a110161ad 100644 (file)
--- a/src/libstd/os.rs
+++ b/src/libstd/os.rs
@@ -81,7 +81,7 @@ pub fn num_cpus() -> uint {
 /// # Failure
 ///
 /// Fails if the current working directory value is invalid:
-/// Possibles cases:
+/// Possible cases:
 ///
 /// * Current directory does not exist.
 /// * There are insufficient permissions to access the current directory.