about summary refs log tree commit diff
path: root/src/libnative
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-05-22 20:56:18 -0700
committerbors <bors@rust-lang.org>2014-05-22 20:56:18 -0700
commit02117dd1bc10c65ca1f56fd81996a573c88ccfd5 (patch)
tree37eef5dbc14141cacc83d97e025cc398a85f7508 /src/libnative
parentec0258a381b88b5574e3f8ce72ae553ac3a574b7 (diff)
parentd3fde8476b9cdce734dcec6b2003a482c5908235 (diff)
downloadrust-02117dd1bc10c65ca1f56fd81996a573c88ccfd5.tar.gz
rust-02117dd1bc10c65ca1f56fd81996a573c88ccfd5.zip
auto merge of #14357 : huonw/rust/spelling, r=pnkfelix
The span on a inner doc-comment would point to the next token, e.g. the span for the `a` line points to the `b` line, and the span of `b` points to the `fn`.

```rust
//! a
//! b

fn bar() {}
```

Diffstat (limited to 'src/libnative')
-rw-r--r--src/libnative/io/timer_unix.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libnative/io/timer_unix.rs b/src/libnative/io/timer_unix.rs
index ed218022b2e..8aa8b12b26d 100644
--- a/src/libnative/io/timer_unix.rs
+++ b/src/libnative/io/timer_unix.rs
@@ -23,7 +23,7 @@
 //!
 //! Whenever the call to select() times out, then a channel receives a message.
 //! Whenever the call returns that the file descriptor has information, then the
-//! channel from timers is drained, enqueueing all incoming requests.
+//! channel from timers is drained, enqueuing all incoming requests.
 //!
 //! The actual implementation of the helper thread is a sorted array of
 //! timers in terms of target firing date. The target is the absolute time at
@@ -42,7 +42,7 @@
 //! thread. Whenever the timer is modified, it first takes ownership back from
 //! the worker thread in order to modify the same data structure. This has the
 //! side effect of "cancelling" the previous requests while allowing a
-//! re-enqueueing later on.
+//! re-enqueuing later on.
 //!
 //! Note that all time units in this file are in *milliseconds*.