about summary refs log tree commit diff
path: root/src/libstd/io/timer.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-06-08 12:51:51 -0700
committerbors <bors@rust-lang.org>2014-06-08 12:51:51 -0700
commite688d0e846e4fc24ab032b2c301fa355235c108a (patch)
treeed6522d5f7ea5436c9fdd32cd9d6bb6c75c52e3f /src/libstd/io/timer.rs
parent8dcbdaaeb79c69cc3ba6efb68650c89ca47969e4 (diff)
parent45e56eccbed3161dd9de547c6c2dcf618114a484 (diff)
downloadrust-e688d0e846e4fc24ab032b2c301fa355235c108a.tar.gz
rust-e688d0e846e4fc24ab032b2c301fa355235c108a.zip
auto merge of #14751 : jbcrail/rust/fix-comments, r=alexcrichton
Diffstat (limited to 'src/libstd/io/timer.rs')
-rw-r--r--src/libstd/io/timer.rs6
1 files changed, 3 insertions, 3 deletions
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);
     })