diff options
| author | bors <bors@rust-lang.org> | 2014-08-13 21:26:28 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-08-13 21:26:28 +0000 |
| commit | 0f09f51c61f1671caa75e9797f081ab4e312b634 (patch) | |
| tree | 9f4bac42c721324aa74f8dbf8426614beebea3ab | |
| parent | 86ecfa491fcaf3dfbc8275fbda5c6e31841a1866 (diff) | |
| parent | 061cdec5dfefc91ce2ad00cef1435ce9b7b1db74 (diff) | |
| download | rust-0f09f51c61f1671caa75e9797f081ab4e312b634.tar.gz rust-0f09f51c61f1671caa75e9797f081ab4e312b634.zip | |
auto merge of #16438 : phi-gamma/rust/doc-fixes, r=brson
Fixes wording in the *runtime*, *testing* and *unsafe* guides.
| -rw-r--r-- | src/doc/guide-runtime.md | 2 | ||||
| -rw-r--r-- | src/doc/guide-testing.md | 2 | ||||
| -rw-r--r-- | src/doc/guide-unsafe.md | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/doc/guide-runtime.md b/src/doc/guide-runtime.md index 1367bdc0755..24b5834ef7c 100644 --- a/src/doc/guide-runtime.md +++ b/src/doc/guide-runtime.md @@ -128,7 +128,7 @@ itself, yet again implying that they are not defined in the standard library. The full complement of runtime features is defined by the [`Runtime` trait](std/rt/trait.Runtime.html) and the [`Task` struct](std/rt/task/struct.Task.html). A `Task` is constant among all runtime -implementations, but each runtime implements has its own implementation of the +implementations, but each runtime has its own implementation of the `Runtime` trait. The local `Task` stores the runtime value inside of itself, and then ownership diff --git a/src/doc/guide-testing.md b/src/doc/guide-testing.md index 1d6513972a6..6fb198fbd2b 100644 --- a/src/doc/guide-testing.md +++ b/src/doc/guide-testing.md @@ -198,7 +198,7 @@ per-iteration speed of. For benchmarks relating to processing/generating data, one can set the `bytes` field to the number of bytes consumed/produced in each -iteration; this will used to show the throughput of the benchmark. +iteration; this will be used to show the throughput of the benchmark. This must be the amount used in each iteration, *not* the total amount. diff --git a/src/doc/guide-unsafe.md b/src/doc/guide-unsafe.md index 8349c8ebcb6..2ff63055480 100644 --- a/src/doc/guide-unsafe.md +++ b/src/doc/guide-unsafe.md @@ -137,7 +137,7 @@ explicitly with, respectively, `value as *const T` and `value as *mut T`). Going the opposite direction, from `*const` to a reference `&`, is not safe. A `&T` is always valid, and so, at a minimum, the raw pointer -`*const T` has to be a valid to a valid instance of type `T`. Furthermore, +`*const T` has to point to a valid instance of type `T`. Furthermore, the resulting pointer must satisfy the aliasing and mutability laws of references. The compiler assumes these properties are true for any references, no matter how they are created, and so any conversion from |