diff options
| author | bors <bors@rust-lang.org> | 2014-06-08 12:51:51 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-06-08 12:51:51 -0700 |
| commit | e688d0e846e4fc24ab032b2c301fa355235c108a (patch) | |
| tree | ed6522d5f7ea5436c9fdd32cd9d6bb6c75c52e3f /src/libstd/io | |
| parent | 8dcbdaaeb79c69cc3ba6efb68650c89ca47969e4 (diff) | |
| parent | 45e56eccbed3161dd9de547c6c2dcf618114a484 (diff) | |
| download | rust-e688d0e846e4fc24ab032b2c301fa355235c108a.tar.gz rust-e688d0e846e4fc24ab032b2c301fa355235c108a.zip | |
auto merge of #14751 : jbcrail/rust/fix-comments, r=alexcrichton
Diffstat (limited to 'src/libstd/io')
| -rw-r--r-- | src/libstd/io/mod.rs | 2 | ||||
| -rw-r--r-- | src/libstd/io/process.rs | 2 | ||||
| -rw-r--r-- | src/libstd/io/stdio.rs | 2 | ||||
| -rw-r--r-- | src/libstd/io/timer.rs | 6 |
4 files changed, 6 insertions, 6 deletions
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<Writer:Send>) pub fn stdin() -> BufferedReader<StdReader> { // 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); }) |
