Skip to content

Commit b5519db

Browse files
committed
Rollup merge of #53496 - matthiaskrgr:codespell_08_2018, r=varkor
Fix typos found by codespell.
2 parents 0834a1a + 71120ef commit b5519db

File tree

99 files changed

+130
-130
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

99 files changed

+130
-130
lines changed

src/ci/docker/scripts/musl.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ shift
3232

3333
export CFLAGS="-fPIC $CFLAGS"
3434

35-
# FIXME: remove the patch when upate to 1.1.20
35+
# FIXME: remove the patch when updating to 1.1.20
3636
MUSL=musl-1.1.19
3737

3838
# may have been downloaded in a previous run

src/doc/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ minimum. It also includes exercises!
3434

3535
# Use Rust
3636

37-
Once you've gotten familliar with the language, these resources can help you
37+
Once you've gotten familiar with the language, these resources can help you
3838
when you're actually using it day-to-day.
3939

4040
## The Standard Library

src/doc/rustc/src/codegen-options/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ This option allows you to put extra data in each output filename.
153153
This flag lets you control how many threads are used when doing
154154
code generation.
155155

156-
Increasing paralellism may speed up compile times, but may also
156+
Increasing parallelism may speed up compile times, but may also
157157
produce slower code.
158158

159159
## remark

src/doc/rustc/src/lints/listing/deny-by-default.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ mod m {
5656
pub struct S(u8);
5757
5858
fn f() {
59-
// this is trying to use S from the 'use' line, but becuase the `u8` is
59+
// this is trying to use S from the 'use' line, but because the `u8` is
6060
// not pub, it is private
6161
::S;
6262
}
@@ -103,7 +103,7 @@ This warning can always be fixed by removing the unused pattern in the
103103

104104
## mutable-transmutes
105105

106-
This lint catches transmuting from `&T` to `&mut T` becuase it is undefined
106+
This lint catches transmuting from `&T` to `&mut T` because it is undefined
107107
behavior. Some example code that triggers this lint:
108108

109109
```rust,ignore

src/doc/rustdoc/src/unstable-features.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Unstable features
22

3-
Rustdoc is under active developement, and like the Rust compiler, some features are only available
3+
Rustdoc is under active development, and like the Rust compiler, some features are only available
44
on the nightly releases. Some of these are new and need some more testing before they're able to get
55
released to the world at large, and some of them are tied to features in the Rust compiler that are
66
themselves unstable. Several features here require a matching `#![feature(...)]` attribute to

src/doc/unstable-book/src/language-features/infer-outlives-requirements.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ The tracking issue for this feature is: [#44493]
66

77
------------------------
88
The `infer_outlives_requirements` feature indicates that certain
9-
outlives requirements can be infered by the compiler rather than
9+
outlives requirements can be inferred by the compiler rather than
1010
stating them explicitly.
1111

1212
For example, currently generic struct definitions that contain
1313
references, require where-clauses of the form T: 'a. By using
14-
this feature the outlives predicates will be infered, although
14+
this feature the outlives predicates will be inferred, although
1515
they may still be written explicitly.
1616

1717
```rust,ignore (pseudo-Rust)

src/doc/unstable-book/src/language-features/infer-static-outlives-requirements.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ The tracking issue for this feature is: [#44493]
66

77
------------------------
88
The `infer_static_outlives_requirements` feature indicates that certain
9-
`'static` outlives requirements can be infered by the compiler rather than
9+
`'static` outlives requirements can be inferred by the compiler rather than
1010
stating them explicitly.
1111

1212
Note: It is an accompanying feature to `infer_outlives_requirements`,
1313
which must be enabled to infer outlives requirements.
1414

1515
For example, currently generic struct definitions that contain
1616
references, require where-clauses of the form T: 'static. By using
17-
this feature the outlives predicates will be infered, although
17+
this feature the outlives predicates will be inferred, although
1818
they may still be written explicitly.
1919

2020
```rust,ignore (pseudo-Rust)

src/liballoc/raw_vec.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
#![unstable(feature = "raw_vec_internals", reason = "implemention detail", issue = "0")]
11+
#![unstable(feature = "raw_vec_internals", reason = "implementation detail", issue = "0")]
1212
#![doc(hidden)]
1313

1414
use core::cmp;

src/libcore/future/future_obj.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ use task::{Context, Poll};
2727
/// - The `Future` trait is currently not object safe: The `Future::poll`
2828
/// method makes uses the arbitrary self types feature and traits in which
2929
/// this feature is used are currently not object safe due to current compiler
30-
/// limitations. (See tracking issue for arbitray self types for more
30+
/// limitations. (See tracking issue for arbitrary self types for more
3131
/// information #44874)
3232
pub struct LocalFutureObj<'a, T> {
3333
ptr: *mut (),
@@ -102,7 +102,7 @@ impl<'a, T> Drop for LocalFutureObj<'a, T> {
102102
/// - The `Future` trait is currently not object safe: The `Future::poll`
103103
/// method makes uses the arbitrary self types feature and traits in which
104104
/// this feature is used are currently not object safe due to current compiler
105-
/// limitations. (See tracking issue for arbitray self types for more
105+
/// limitations. (See tracking issue for arbitrary self types for more
106106
/// information #44874)
107107
pub struct FutureObj<'a, T>(LocalFutureObj<'a, T>);
108108

src/libcore/ptr.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2291,7 +2291,7 @@ impl<T: ?Sized> *mut T {
22912291
///
22922292
/// If we ever decide to make it possible to call the intrinsic with `a` that is not a
22932293
/// power-of-two, it will probably be more prudent to just change to a naive implementation rather
2294-
/// than trying to adapt this to accomodate that change.
2294+
/// than trying to adapt this to accommodate that change.
22952295
///
22962296
/// Any questions go to @nagisa.
22972297
#[lang="align_offset"]

0 commit comments

Comments
 (0)