Skip to content

Commit ece9a57

Browse files
committed
fix some typos
1 parent ebda766 commit ece9a57

File tree

24 files changed

+37
-37
lines changed

24 files changed

+37
-37
lines changed

CONTRIBUTING.md

+1-1
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

+10-10
Original file line numberDiff line numberDiff line change
@@ -624,7 +624,7 @@ Misc
624624
----
625625

626626
- [rustdoc can now use pulldown-cmark with the `--enable-commonmark` flag][40338]
627-
- [Added rust-winbg script for better debugging on Windows][39983]
627+
- [Added rust-windbg script for better debugging on Windows][39983]
628628
- [Rust now uses the official cross compiler for NetBSD][40612]
629629
- [rustdoc now accepts `#` at the start of files][40828]
630630
- [Fixed jemalloc support for musl][41168]
@@ -1658,7 +1658,7 @@ Diagnostics
16581658
-----------
16591659

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

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

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

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

src/bootstrap/job.rs

+1-1
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

+1-1
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

+2-2
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

+1-1
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

+1-1
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

+2-2
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

+1-1
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

+1-1
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

src/doc/unstable-book/src/language-features/unboxed-closures.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ See Also: [`fn_traits`](library-features/fn-traits.html)
99
----
1010

1111
The `unboxed_closures` feature allows you to write functions using the `"rust-call"` ABI,
12-
required for implmenting the [`Fn*`] family of traits. `"rust-call"` functions must have
12+
required for implementing the [`Fn*`] family of traits. `"rust-call"` functions must have
1313
exactly one (non self) argument, a tuple representing the argument list.
1414

1515
[`Fn*`]: https://doc.rust-lang.org/std/ops/trait.Fn.html

src/etc/installer/exe/modpath.iss

+1-1
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ begin
144144
end;
145145
end;
146146
147-
// Split a string into an array using passed delimeter
147+
// Split a string into an array using passed delimiter
148148
procedure Explode(var Dest: TArrayOfString; Text: String; Separator: String);
149149
var
150150
i: Integer;

src/liballoc/fmt.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,7 @@ use string;
536536
/// assert_eq!(s, "Hello, world!");
537537
/// ```
538538
///
539-
/// Please note that using [`format!`] might be preferrable.
539+
/// Please note that using [`format!`] might be preferable.
540540
/// Example:
541541
///
542542
/// ```

src/liballoc/macros.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ macro_rules! vec {
7272

7373
/// Creates a `String` using interpolation of runtime expressions.
7474
///
75-
/// The first argument `format!` recieves is a format string. This must be a string
75+
/// The first argument `format!` receives is a format string. This must be a string
7676
/// literal. The power of the formatting string is in the `{}`s contained.
7777
///
7878
/// Additional parameters passed to `format!` replace the `{}`s within the

src/liballoc/rc.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ impl<T> Rc<T> {
346346
unsafe {
347347
let val = ptr::read(&*this); // copy the contained object
348348

349-
// Indicate to Weaks that they can't be promoted by decrememting
349+
// Indicate to Weaks that they can't be promoted by decrementing
350350
// the strong count, and then remove the implicit "strong weak"
351351
// pointer while also handling drop logic by just crafting a
352352
// fake Weak.

src/liballoc/string.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -596,7 +596,7 @@ impl String {
596596
/// Decode a UTF-16 encoded vector `v` into a `String`, returning [`Err`]
597597
/// if `v` contains any invalid data.
598598
///
599-
/// [`Err`]: ../../std/result/enum.Result.htlm#variant.Err
599+
/// [`Err`]: ../../std/result/enum.Result.html#variant.Err
600600
///
601601
/// # Examples
602602
///

src/liballoc/tests/str.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1427,12 +1427,12 @@ mod pattern {
14271427
Reject(6, 7),
14281428
Match (7, 7),
14291429
]);
1430-
make_test!(str_searcher_mulibyte_haystack, " ", "├──", [
1430+
make_test!(str_searcher_multibyte_haystack, " ", "├──", [
14311431
Reject(0, 3),
14321432
Reject(3, 6),
14331433
Reject(6, 9),
14341434
]);
1435-
make_test!(str_searcher_empty_needle_mulibyte_haystack, "", "├──", [
1435+
make_test!(str_searcher_empty_needle_multibyte_haystack, "", "├──", [
14361436
Match (0, 0),
14371437
Reject(0, 3),
14381438
Match (3, 3),
@@ -1455,7 +1455,7 @@ mod pattern {
14551455
Match (5, 6),
14561456
Reject(6, 7),
14571457
]);
1458-
make_test!(char_searcher_mulibyte_haystack, ' ', "├──", [
1458+
make_test!(char_searcher_multibyte_haystack, ' ', "├──", [
14591459
Reject(0, 3),
14601460
Reject(3, 6),
14611461
Reject(6, 9),

src/liballoc/vec.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1089,7 +1089,7 @@ impl<T> Vec<T> {
10891089
// Memory safety
10901090
//
10911091
// When the Drain is first created, it shortens the length of
1092-
// the source vector to make sure no uninitalized or moved-from elements
1092+
// the source vector to make sure no uninitialized or moved-from elements
10931093
// are accessible at all if the Drain's destructor never gets to run.
10941094
//
10951095
// Drain will ptr::read out the values to remove.

src/libbacktrace/configure

+1-1
Original file line numberDiff line numberDiff line change
@@ -14584,7 +14584,7 @@ func_basename ()
1458414584
# to NONDIR_REPLACEMENT.
1458514585
# value returned in "$func_dirname_result"
1458614586
# basename: Compute filename of FILE.
14587-
# value retuned in "$func_basename_result"
14587+
# value returned in "$func_basename_result"
1458814588
# Implementation must be kept synchronized with func_dirname
1458914589
# and func_basename. For efficiency, we do not delegate to
1459014590
# those functions but instead duplicate the functionality here.

src/libbacktrace/ltmain.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ basename="s,^.*/,,"
177177
# to NONDIR_REPLACEMENT.
178178
# value returned in "$func_dirname_result"
179179
# basename: Compute filename of FILE.
180-
# value retuned in "$func_basename_result"
180+
# value returned in "$func_basename_result"
181181
# Implementation must be kept synchronized with func_dirname
182182
# and func_basename. For efficiency, we do not delegate to
183183
# those functions but instead duplicate the functionality here.

src/libcore/fmt/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -952,7 +952,7 @@ pub trait UpperExp {
952952
/// assert_eq!(output, "Hello world!");
953953
/// ```
954954
///
955-
/// Please note that using [`write!`] might be preferrable. Example:
955+
/// Please note that using [`write!`] might be preferable. Example:
956956
///
957957
/// ```
958958
/// use std::fmt::Write;

src/librustc_data_structures/array_vec.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ impl<A: Array> ArrayVec<A> {
111111
// Memory safety
112112
//
113113
// When the Drain is first created, it shortens the length of
114-
// the source vector to make sure no uninitalized or moved-from elements
114+
// the source vector to make sure no uninitialized or moved-from elements
115115
// are accessible at all if the Drain's destructor never gets to run.
116116
//
117117
// Drain will ptr::read out the values to remove.

src/libstd/path.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3752,7 +3752,7 @@ mod tests {
37523752
}
37533753

37543754
#[test]
3755-
fn test_eq_recievers() {
3755+
fn test_eq_receivers() {
37563756
use borrow::Cow;
37573757

37583758
let borrowed: &Path = Path::new("foo/bar");

src/test/mir-opt/issue-41697.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// artificial cycles: during type-checking, we had to get the MIR for
1313
// the constant expressions in `[u8; 2]`, which in turn would trigger
1414
// an attempt to get the item-path, which in turn would request the
15-
// types of the impl, which would trigger a cycle. We supressed this
15+
// types of the impl, which would trigger a cycle. We suppressed this
1616
// cycle now by forcing mir-dump to avoid asking for types of an impl.
1717

1818
#![feature(rustc_attrs)]

0 commit comments

Comments
 (0)