Skip to content

Commit 7c8b36f

Browse files
authored
Rollup merge of #46157 - martinlindhe:master, r=kennytm
fix some typos This is the result of me testing out a WIP source code typo-finder and your project was the random target this time.
2 parents 7f0a1e2 + ece9a57 commit 7c8b36f

File tree

24 files changed

+37
-37
lines changed

24 files changed

+37
-37
lines changed

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,7 @@ Here are those same steps in detail:
421421

422422
These instructions are specific to updating `rustfmt`, however they may apply
423423
to the other submodules as well. Please help by improving these instructions
424-
if you find any discrepencies or special cases that need to be addressed.
424+
if you find any discrepancies or special cases that need to be addressed.
425425

426426
To update the `rustfmt` submodule, start by running the appropriate
427427
[`git submodule` command](https://git-scm.com/book/en/v2/Git-Tools-Submodules).

RELEASES.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -621,7 +621,7 @@ Misc
621621
----
622622

623623
- [rustdoc can now use pulldown-cmark with the `--enable-commonmark` flag][40338]
624-
- [Added rust-winbg script for better debugging on Windows][39983]
624+
- [Added rust-windbg script for better debugging on Windows][39983]
625625
- [Rust now uses the official cross compiler for NetBSD][40612]
626626
- [rustdoc now accepts `#` at the start of files][40828]
627627
- [Fixed jemalloc support for musl][41168]
@@ -1655,7 +1655,7 @@ Diagnostics
16551655
-----------
16561656

16571657
* [Replace macro backtraces with labeled local uses][35702]
1658-
* [Improve error message for missplaced doc comments][33922]
1658+
* [Improve error message for misplaced doc comments][33922]
16591659
* [Buffer unix and lock windows to prevent message interleaving][35975]
16601660
* [Update lifetime errors to specifically note temporaries][36171]
16611661
* [Special case a few colors for Windows][36178]
@@ -1963,7 +1963,7 @@ Language
19631963
useful](https://github.com/rust-lang/rust/pull/34908)
19641964
* [`macro_rules!` `stmt` matchers correctly consume the entire contents when
19651965
inside non-braces invocations](https://github.com/rust-lang/rust/pull/34886)
1966-
* [Semicolons are properly required as statement delimeters inside
1966+
* [Semicolons are properly required as statement delimiters inside
19671967
`macro_rules!` invocations](https://github.com/rust-lang/rust/pull/34660)
19681968
* [`cfg_attr` works on `path` attributes](https://github.com/rust-lang/rust/pull/34546)
19691969

@@ -2188,7 +2188,7 @@ Compatibility Notes
21882188
* [`const`s and `static`s may not have unsized types](https://github.com/rust-lang/rust/pull/34443)
21892189
* [The new follow-set rules that place restrictions on `macro_rules!`
21902190
in order to ensure syntax forward-compatibility have been enabled](https://github.com/rust-lang/rust/pull/33982)
2191-
This was an [ammendment to RFC 550](https://github.com/rust-lang/rfcs/pull/1384),
2191+
This was an [amendment to RFC 550](https://github.com/rust-lang/rfcs/pull/1384),
21922192
and has been a warning since 1.10.
21932193
* [`cfg` attribute process has been refactored to fix various bugs](https://github.com/rust-lang/rust/pull/33706).
21942194
This causes breakage in some corner cases.
@@ -3345,7 +3345,7 @@ Libraries
33453345
* `FromStr` is [implemented for `SockAddrV4` and `SockAddrV6`][1.5s].
33463346
* There are now `From` conversions [between floating point
33473347
types][1.5f] where the conversions are lossless.
3348-
* Thera are now `From` conversions [between integer types][1.5i] where
3348+
* There are now `From` conversions [between integer types][1.5i] where
33493349
the conversions are lossless.
33503350
* [`fs::Metadata` implements `Clone`][1.5fs].
33513351
* The `parse` method [accepts a leading "+" when parsing
@@ -3545,7 +3545,7 @@ Libraries
35453545
* [`IntoIterator` is implemented for references to `Option` and
35463546
`Result`][into2].
35473547
* [`HashMap` and `HashSet` implement `Extend<&T>` where `T:
3548-
Copy`][ext] as part of [RFC 839]. This will cause type inferance
3548+
Copy`][ext] as part of [RFC 839]. This will cause type inference
35493549
breakage in rare situations.
35503550
* [`BinaryHeap` implements `Debug`][bh2].
35513551
* [`Borrow` and `BorrowMut` are implemented for fixed-size
@@ -3556,7 +3556,7 @@ Libraries
35563556
* `&mut T` where `T: std::fmt::Write` [also implements
35573557
`std::fmt::Write`][mutw].
35583558
* [A stable regression in `VecDeque::push_back` and other
3559-
capicity-altering methods that caused panics for zero-sized types
3559+
capacity-altering methods that caused panics for zero-sized types
35603560
was fixed][vd].
35613561
* [Function pointers implement traits for up to 12 parameters][fp2].
35623562

@@ -3743,7 +3743,7 @@ Libraries
37433743
[better for long data][sh].
37443744
* [`AtomicPtr`] implements [`Send`].
37453745
* The [`read_to_end`] implementations for [`Stdin`] and [`File`]
3746-
are now [specialized to use uninitalized buffers for increased
3746+
are now [specialized to use uninitialized buffers for increased
37473747
performance][rte].
37483748
* Lifetime parameters of foreign functions [are now resolved
37493749
properly][f].
@@ -3872,7 +3872,7 @@ Highlights
38723872
* This is the first release with [experimental support for linking
38733873
with the MSVC linker and lib C on Windows (instead of using the GNU
38743874
variants via MinGW)][win]. It is yet recommended only for the most
3875-
intrepid Rusticians.
3875+
intrepid Rustaceans.
38763876
* Benchmark compilations are showing a 30% improvement in
38773877
bootstrapping over 1.1.
38783878

@@ -4738,7 +4738,7 @@ Version 0.11.0 (2014-07-02)
47384738
* Libraries
47394739
* The standard library is now a "facade" over a number of underlying
47404740
libraries. This means that development on the standard library should
4741-
be speeder due to smaller crates, as well as a clearer line between
4741+
be speedier due to smaller crates, as well as a clearer line between
47424742
all dependencies.
47434743
* A new library, libcore, lives under the standard library's facade
47444744
which is Rust's "0-assumption" library, suitable for embedded and

src/bootstrap/job.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ pub unsafe fn setup(build: &mut Build) {
185185
0, FALSE, DUPLICATE_SAME_ACCESS);
186186

187187
// If this failed, well at least we tried! An example of DuplicateHandle
188-
// failing in the past has been when the wrong python2 package spawed this
188+
// failing in the past has been when the wrong python2 package spawned this
189189
// build system (e.g. the `python2` package in MSYS instead of
190190
// `mingw-w64-x86_64-python2`. Not sure why it failed, but the "failure
191191
// mode" here is that we only clean everything up when the build system

src/bootstrap/sanity.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ pub fn check(build: &mut Build) {
7878
}
7979

8080
let mut cmd_finder = Finder::new();
81-
// If we've got a git directory we're gona need git to update
81+
// If we've got a git directory we're gonna need git to update
8282
// submodules and learn about various other aspects.
8383
if build.rust_info.is_git() {
8484
cmd_finder.must_have("git");

src/ci/docker/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ a Docker image.
3636

3737
1. Select the "default" virtual machine inside VirtualBox, then click
3838
"Settings"
39-
2. Go to "Shared Folders", click "Add shared foldrer" (the folder icon with
39+
2. Go to "Shared Folders", click "Add shared folder" (the folder icon with
4040
a plus sign), fill in the following information, then click "OK":
4141

4242
* Folder path: `E:\rust`
4343
* Folder name: `e/rust`
4444
* Read-only: ☐ *unchecked*
4545
* Auto-mount: ☑ *checked*
46-
* Make Permanant: ☑ *checked*
46+
* Make Permanent: ☑ *checked*
4747

4848
3. VirtualBox might not support creating symbolic links inside a shared folder
4949
by default. You can enable it manually by running these from `cmd.exe`:

src/ci/docker/dist-x86_64-netbsd/build-netbsd-toolchain.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ curl $URL/2017-03-17-netbsd-comp.tgz | \
5252
cd usr/src
5353

5454
# The options, in order, do the following
55-
# * this is an unpriviledged build
55+
# * this is an unprivileged build
5656
# * output to a predictable location
5757
# * disable various uneeded stuff
5858
MKUNPRIVED=yes TOOLDIR=/x-tools/x86_64-unknown-netbsd \

src/ci/run.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ if [ "$DIST_SRC" = "" ]; then
3737
fi
3838

3939
# If we're deploying artifacts then we set the release channel, otherwise if
40-
# we're not deploying then we want to be sure to enable all assertions becauase
40+
# we're not deploying then we want to be sure to enable all assertions because
4141
# we'll be running tests
4242
#
4343
# FIXME: need a scheme for changing this `nightly` value to `beta` and `stable`

src/doc/rustdoc/src/command-line-arguments.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ $ rustdoc README.md --markdown-playground-url https://play.rust-lang.org/
279279
```
280280

281281
When rendering a Markdown file, this flag gives the base URL of the Rust
282-
Playround, to use for generating `Run` buttons.
282+
Playground, to use for generating `Run` buttons.
283283

284284

285285
## `--markdown-no-toc`: don't generate a table of contents
@@ -291,7 +291,7 @@ $ rustdoc README.md --markdown-no-toc
291291
```
292292

293293
When generating documentation from a Markdown file, by default, `rustdoc` will
294-
generate a table of contents. This flag supresses that, and no TOC will be
294+
generate a table of contents. This flag suppresses that, and no TOC will be
295295
generated.
296296

297297

src/doc/rustdoc/src/documentation-tests.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ running them. Here's the full algorithm rustdoc uses to preprocess examples:
5050
5. Finally, if the example does not contain `fn main`, the remainder of the
5151
text is wrapped in `fn main() { your_code }`.
5252

53-
For more about that caveat in rule 4, see "Documeting Macros" below.
53+
For more about that caveat in rule 4, see "Documenting Macros" below.
5454

5555
## Hiding portions of the example
5656

src/doc/unstable-book/src/language-features/optin-builtin-traits.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ The `optin_builtin_traits` feature gate allows you to define auto traits.
1010

1111
Auto traits, like [`Send`] or [`Sync`] in the standard library, are marker traits
1212
that are automatically implemented for every type, unless the type, or a type it contains,
13-
has explictly opted out via a negative impl.
13+
has explicitly opted out via a negative impl.
1414

1515
[`Send`]: https://doc.rust-lang.org/std/marker/trait.Send.html
1616
[`Sync`]: https://doc.rust-lang.org/std/marker/trait.Sync.html

0 commit comments

Comments
 (0)