diff options
| author | bors <bors@rust-lang.org> | 2014-02-18 02:51:49 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-02-18 02:51:49 -0800 |
| commit | b3ed38f2196e8636f9f295da8d06c6921db183fe (patch) | |
| tree | 02968a54be00a4a213dece5f5900230809ce7f5a /src/libstd/rt | |
| parent | 1e60084257ca6f264610544964bf553f1feba83b (diff) | |
| parent | 6555b04dd2fbcd18c8fa8beb2bebc4b81febc6b0 (diff) | |
| download | rust-b3ed38f2196e8636f9f295da8d06c6921db183fe.tar.gz rust-b3ed38f2196e8636f9f295da8d06c6921db183fe.zip | |
auto merge of #12345 : huonw/rust/speeling, r=cmr
Diffstat (limited to 'src/libstd/rt')
| -rw-r--r-- | src/libstd/rt/task.rs | 2 | ||||
| -rw-r--r-- | src/libstd/rt/unwind.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/rt/task.rs b/src/libstd/rt/task.rs index 0719523af77..72ba98eab4f 100644 --- a/src/libstd/rt/task.rs +++ b/src/libstd/rt/task.rs @@ -254,7 +254,7 @@ impl Task { ops.deschedule(amt, self, f) } - /// Wakes up a previously blocked task, optionally specifiying whether the + /// Wakes up a previously blocked task, optionally specifying whether the /// current task can accept a change in scheduling. This function can only /// be called on tasks that were previously blocked in `deschedule`. pub fn reawaken(mut ~self) { diff --git a/src/libstd/rt/unwind.rs b/src/libstd/rt/unwind.rs index 5718a27bfef..ef8bd94c897 100644 --- a/src/libstd/rt/unwind.rs +++ b/src/libstd/rt/unwind.rs @@ -400,7 +400,7 @@ pub fn begin_unwind_raw(msg: *u8, file: *u8, line: uint) -> ! { /// The entry point for unwinding with a formatted message. /// /// This is designed to reduce the amount of code required at the call -/// site as much as possible (so that `fail!()` has as low an implact +/// site as much as possible (so that `fail!()` has as low an impact /// on (e.g.) the inlining of other functions as possible), by moving /// the actual formatting into this shared place. #[inline(never)] #[cold] |