diff --git a/src/libcollections/vec.rs b/src/libcollections/vec.rs index 6ca21262f51..37546f64d5f 100644 --- a/src/libcollections/vec.rs +++ b/src/libcollections/vec.rs @@ -1532,7 +1532,7 @@ impl FromVec for ~[T] { // In a post-DST world, we can attempt to reuse the Vec allocation by calling // shrink_to_fit() on it. That may involve a reallocation+memcpy, but that's no - // diffrent than what we're doing manually here. + // different than what we're doing manually here. let vp = v.as_mut_ptr(); diff --git a/src/libcore/simd.rs b/src/libcore/simd.rs index 99b802f9918..54e7d077bb1 100644 --- a/src/libcore/simd.rs +++ b/src/libcore/simd.rs @@ -31,7 +31,7 @@ //! //! ## Stability Note //! -//! These are all experimental. The inferface may change entirely, without +//! These are all experimental. The interface may change entirely, without //! warning. #![allow(non_camel_case_types)] diff --git a/src/libcore/str.rs b/src/libcore/str.rs index 936b698d4b1..87177b4ac90 100644 --- a/src/libcore/str.rs +++ b/src/libcore/str.rs @@ -478,7 +478,7 @@ impl TwoWaySearcher { } /// The internal state of an iterator that searches for matches of a substring -/// within a larger string using a dynamically chosed search algorithm +/// within a larger string using a dynamically chosen search algorithm #[deriving(Clone)] enum Searcher { Naive(NaiveSearcher), @@ -1120,7 +1120,7 @@ pub trait StrSlice<'a> { /// /// That is, each returned value `(start, end)` satisfies /// `self.slice(start, end) == sep`. For matches of `sep` within - /// `self` that overlap, only the indicies corresponding to the + /// `self` that overlap, only the indices corresponding to the /// first match are returned. /// /// # Example diff --git a/src/libserialize/json.rs b/src/libserialize/json.rs index 046d25f98e4..9907faae52b 100644 --- a/src/libserialize/json.rs +++ b/src/libserialize/json.rs @@ -992,7 +992,7 @@ enum ParserState { ParseObject(bool), // Parse ',' or ']' after an element in an object. ParseObjectComma, - // Initialial state. + // Initial state. ParseStart, // Expecting the stream to end. ParseBeforeFinish, @@ -1152,7 +1152,7 @@ pub struct Parser { // We maintain a stack representing where we are in the logical structure // of the JSON stream. stack: Stack, - // A state machine is kept to make it possible to interupt and resume parsing. + // A state machine is kept to make it possible to interrupt and resume parsing. state: ParserState, } @@ -1449,7 +1449,7 @@ impl> Parser { // information to return a JsonEvent. // Manages an internal state so that parsing can be interrupted and resumed. // Also keeps track of the position in the logical structure of the json - // stream int the form of a stack that can be queried by the user usng the + // stream int the form of a stack that can be queried by the user using the // stack() method. fn parse(&mut self) -> JsonEvent { loop { diff --git a/src/libstd/io/mod.rs b/src/libstd/io/mod.rs index c72cc0ded9b..7b655693395 100644 --- a/src/libstd/io/mod.rs +++ b/src/libstd/io/mod.rs @@ -910,7 +910,7 @@ impl<'a> Reader for &'a mut Reader { /// Returns a slice of `v` between `start` and `end`. /// -/// Similar to `slice()` except this function only bounds the sclie on the +/// Similar to `slice()` except this function only bounds the slice on the /// capacity of `v`, not the length. /// /// # Failure diff --git a/src/libstd/io/process.rs b/src/libstd/io/process.rs index 059286339a6..3cb2fe1c8f1 100644 --- a/src/libstd/io/process.rs +++ b/src/libstd/io/process.rs @@ -873,7 +873,7 @@ mod tests { pub fn sleeper() -> Process { // There's a `timeout` command on windows, but it doesn't like having // its output piped, so instead just ping ourselves a few times with - // gaps inbetweeen so we're sure this process is alive for awhile + // gaps in between so we're sure this process is alive for awhile Command::new("ping").arg("127.0.0.1").arg("-n").arg("1000").spawn().unwrap() } diff --git a/src/libstd/io/stdio.rs b/src/libstd/io/stdio.rs index 5db09076c98..84b91814c87 100644 --- a/src/libstd/io/stdio.rs +++ b/src/libstd/io/stdio.rs @@ -102,7 +102,7 @@ local_data_key!(local_stdout: Box) pub fn stdin() -> BufferedReader { // The default buffer capacity is 64k, but apparently windows doesn't like // 64k reads on stdin. See #13304 for details, but the idea is that on - // windows we use a slighly smaller buffer that's been seen to be + // windows we use a slightly smaller buffer that's been seen to be // acceptable. if cfg!(windows) { BufferedReader::with_capacity(8 * 1024, stdin_raw()) diff --git a/src/libstd/io/timer.rs b/src/libstd/io/timer.rs index 67b6d3c476c..1529cf8f92d 100644 --- a/src/libstd/io/timer.rs +++ b/src/libstd/io/timer.rs @@ -218,7 +218,7 @@ mod test { iotest!(fn test_io_timer_oneshot_then_sleep() { let mut timer = Timer::new().unwrap(); let rx = timer.oneshot(100000000000); - timer.sleep(1); // this should inalidate rx + timer.sleep(1); // this should invalidate rx assert_eq!(rx.recv_opt(), Err(())); }) @@ -352,7 +352,7 @@ mod test { let mut timer1 = Timer::new().unwrap(); timer1.oneshot(1); let mut timer2 = Timer::new().unwrap(); - // while sleeping, the prevous timer should fire and not have its + // while sleeping, the previous timer should fire and not have its // callback do something terrible. timer2.sleep(2); }) @@ -361,7 +361,7 @@ mod test { let mut timer1 = Timer::new().unwrap(); timer1.periodic(1); let mut timer2 = Timer::new().unwrap(); - // while sleeping, the prevous timer should fire and not have its + // while sleeping, the previous timer should fire and not have its // callback do something terrible. timer2.sleep(2); }) diff --git a/src/libstd/num/strconv.rs b/src/libstd/num/strconv.rs index 133a8db90fa..48962ca59d8 100644 --- a/src/libstd/num/strconv.rs +++ b/src/libstd/num/strconv.rs @@ -636,7 +636,7 @@ pub fn from_str_bytes_common+ if accum_positive && accum <= last_accum { return NumStrConv::inf(); } if !accum_positive && accum >= last_accum { return NumStrConv::neg_inf(); } - // Detect overflow by reversing the shift-and-add proccess + // Detect overflow by reversing the shift-and-add process if accum_positive && (last_accum != ((accum - cast(digit as int).unwrap())/radix_gen.clone())) { return NumStrConv::inf(); diff --git a/src/libstd/os.rs b/src/libstd/os.rs index 9a7e061c472..dd692d3fc01 100644 --- a/src/libstd/os.rs +++ b/src/libstd/os.rs @@ -320,7 +320,7 @@ pub fn env_as_bytes() -> Vec<(Vec,Vec)> { /// let key = "HOME"; /// match std::os::getenv(key) { /// Some(val) => println!("{}: {}", key, val), -/// None => println!("{} is not defined in the environnement.", key) +/// None => println!("{} is not defined in the environment.", key) /// } /// ``` pub fn getenv(n: &str) -> Option { diff --git a/src/libstd/path/windows.rs b/src/libstd/path/windows.rs index e53842ecd8f..9bb137edb82 100644 --- a/src/libstd/path/windows.rs +++ b/src/libstd/path/windows.rs @@ -186,7 +186,7 @@ impl GenericPathUnsafe for Path { ret } - /// See `GenericPathUnsafe::set_filename_unchecekd`. + /// See `GenericPathUnsafe::set_filename_unchecked`. /// /// # Failure /// diff --git a/src/libstd/rt/thread.rs b/src/libstd/rt/thread.rs index 81dcf909706..5a077e511c0 100644 --- a/src/libstd/rt/thread.rs +++ b/src/libstd/rt/thread.rs @@ -243,7 +243,7 @@ mod imp { // EINVAL means |stack_size| is either too small or not a // multiple of the system page size. Because it's definitely // >= PTHREAD_STACK_MIN, it must be an alignment issue. - // Round up to the neareast page and try again. + // Round up to the nearest page and try again. let page_size = os::page_size(); let stack_size = (stack_size + page_size - 1) & (-(page_size - 1) - 1); assert_eq!(pthread_attr_setstacksize(&mut attr, stack_size as libc::size_t), 0);