Skip to content

Commit a27dc53

Browse files
committed
auto merge of #13640 : jbcrail/rust/spelling-updates, r=alexcrichton
2 parents 9b5b219 + ae555e3 commit a27dc53

File tree

6 files changed

+10
-10
lines changed

6 files changed

+10
-10
lines changed

src/doc/complement-cheatsheet.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ let x: int = 42;
2929
let y: ~str = format!("{:t}", x); // binary
3030
let y: ~str = format!("{:o}", x); // octal
3131
let y: ~str = format!("{:x}", x); // lowercase hexadecimal
32-
let y: ~str = format!("{:X}", x); // uppercase hexidecimal
32+
let y: ~str = format!("{:X}", x); // uppercase hexadecimal
3333
~~~
3434

3535
**String to int, in non-base-10**

src/doc/guide-ffi.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ Besides classical synchronization mechanisms like mutexes, one possibility in
337337
Rust is to use channels (in `std::comm`) to forward data from the C thread
338338
that invoked the callback into a Rust task.
339339

340-
If an asychronous callback targets a special object in the Rust address space
340+
If an asynchronous callback targets a special object in the Rust address space
341341
it is also absolutely necessary that no more callbacks are performed by the
342342
C library after the respective Rust object gets destroyed.
343343
This can be achieved by unregistering the callback in the object's

src/doc/guide-lifetimes.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -561,7 +561,7 @@ points at a static constant).
561561

562562
Lifetimes can be named and referenced. For example, the special lifetime
563563
`'static`, which does not go out of scope, can be used to create global
564-
variables and communicate between tasks (see the manual for usecases).
564+
variables and communicate between tasks (see the manual for use cases).
565565

566566
## Parameter Lifetimes
567567

src/doc/intro.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ Now here's the exciting part:
226226
because `numbers` is an owned type,
227227
when it is sent across the channel,
228228
it is actually *moved*,
229-
transfering ownership of `numbers` between tasks.
229+
transferring ownership of `numbers` between tasks.
230230
This ownership transfer is *very fast* -
231231
in this case simply copying a pointer -
232232
while also ensuring that the original owning task cannot create data races by continuing to read or write to `numbers` in parallel with the new owner.
@@ -318,7 +318,7 @@ fn main() {
318318
This is almost exactly the same,
319319
except that this time `numbers` is first put into an `Arc`.
320320
`Arc::new` creates the `Arc`,
321-
`.clone()` makes another `Arc` that referrs to the same contents.
321+
`.clone()` makes another `Arc` that refers to the same contents.
322322
So we clone the `Arc` for each task,
323323
send that clone down the channel,
324324
and then use it to print out a number.

src/doc/rust.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ Raw string literals do not process any escapes. They start with the character
295295
`U+0022` (double-quote) character. The _raw string body_ is not defined in the
296296
EBNF grammar above: it can contain any sequence of Unicode characters and is
297297
terminated only by another `U+0022` (double-quote) character, followed by the
298-
same number of `U+0023` (`#`) characters that preceeded the opening `U+0022`
298+
same number of `U+0023` (`#`) characters that preceded the opening `U+0022`
299299
(double-quote) character.
300300

301301
All Unicode characters contained in the raw string body represent themselves,
@@ -2256,7 +2256,7 @@ fn main() {
22562256
Certain aspects of Rust may be implemented in the compiler, but they're not
22572257
necessarily ready for every-day use. These features are often of "prototype
22582258
quality" or "almost production ready", but may not be stable enough to be
2259-
considered a full-fleged language feature.
2259+
considered a full-fledged language feature.
22602260

22612261
For this reason, Rust recognizes a special crate-level attribute of the form:
22622262

@@ -4005,7 +4005,7 @@ dependencies will be used:
40054005
could only be found in an `rlib` format. Remember that `staticlib` formats
40064006
are always ignored by `rustc` for crate-linking purposes.
40074007

4008-
2. If a static library is being produced, all upstream dependecies are
4008+
2. If a static library is being produced, all upstream dependencies are
40094009
required to be available in `rlib` formats. This requirement stems from the
40104010
same reasons that a dynamic library must have all dynamic dependencies.
40114011

src/libstd/fmt/num.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,11 @@ struct Octal;
7474
#[deriving(Clone, Eq)]
7575
struct Decimal;
7676

77-
/// A hexidecimal (base 16) radix, formatted with lower-case characters
77+
/// A hexadecimal (base 16) radix, formatted with lower-case characters
7878
#[deriving(Clone, Eq)]
7979
struct LowerHex;
8080

81-
/// A hexidecimal (base 16) radix, formatted with upper-case characters
81+
/// A hexadecimal (base 16) radix, formatted with upper-case characters
8282
#[deriving(Clone, Eq)]
8383
pub struct UpperHex;
8484

0 commit comments

Comments
 (0)