Skip to content

Commit 0bcf3d0

Browse files
authored
Rollup merge of rust-lang#124322 - whosehang:master, r=Nilstrieb
chore: fix some typos in comments
2 parents 5557f8c + 65d7c1d commit 0bcf3d0

File tree

9 files changed

+9
-9
lines changed

9 files changed

+9
-9
lines changed

compiler/rustc_span/src/hygiene.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1251,7 +1251,7 @@ struct HygieneDecodeContextInner {
12511251
// global `HygieneData`. When we deserialize a `SyntaxContext`, we need to create
12521252
// a new id in the global `HygieneData`. This map tracks the ID we end up picking,
12531253
// so that multiple occurrences of the same serialized id are decoded to the same
1254-
// `SyntaxContext`. This only stores `SyntaxContext`s which are completly decoded.
1254+
// `SyntaxContext`. This only stores `SyntaxContext`s which are completely decoded.
12551255
remapped_ctxts: Vec<Option<SyntaxContext>>,
12561256

12571257
/// Maps serialized `SyntaxContext` ids that are currently being decoded to a `SyntaxContext`.

compiler/rustc_type_ir/src/ty_kind.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ pub enum TyKind<I: Interner> {
227227
/// A placeholder type, used during higher ranked subtyping to instantiate
228228
/// bound variables.
229229
///
230-
/// It is conventional to render anonymous placeholer types like `!N` or `!U_N`,
230+
/// It is conventional to render anonymous placeholder types like `!N` or `!U_N`,
231231
/// where `N` is the placeholder variable's anonymous index (which corresponds
232232
/// to the bound variable's index from the binder from which it was instantiated),
233233
/// and `U` is the universe index in which it is instantiated, or totally omitted

library/core/src/fmt/rt.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ impl<'a> Argument<'a> {
153153
///
154154
/// # Safety
155155
///
156-
/// This argument must actually be a placeholer argument.
156+
/// This argument must actually be a placeholder argument.
157157
///
158158
// FIXME: Transmuting formatter in new and indirectly branching to/calling
159159
// it here is an explicit CFI violation.

src/doc/rustc/src/platform-support/arm64ec-pc-windows-msvc.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ Tests can be run on AArch64 Windows 11 devices.
7373

7474
## Cross-compilation toolchains and C code
7575

76-
C code can be built using the Arm64-targetting MSVC or Clang toolchain.
76+
C code can be built using the Arm64-targeting MSVC or Clang toolchain.
7777

7878
To compile:
7979

src/doc/rustc/src/platform-support/wasm32-wasip1.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ languages compiled to WebAssembly, for example C/C++. Any ABI differences or
5959
mismatches are considered bugs that need to be fixed.
6060

6161
By default the WASI targets in Rust ship in rustup with a precompiled copy of
62-
[`wasi-libc`] meaning that a WebAssembly-targetting-Clang is not required to
62+
[`wasi-libc`] meaning that a WebAssembly-targeting-Clang is not required to
6363
use the WASI targets from Rust. If there is no actual interoperation with C
6464
then `rustup target add wasm32-wasip1` is all that's needed to get
6565
started with WASI.

src/doc/rustdoc/src/lints.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ warning: 1 warning emitted
417417

418418
This lint is **warn-by-default**. It detects explicit links that are the same
419419
as computed automatic links.
420-
This usually means the explicit links are removeable. For example:
420+
This usually means the explicit links are removable. For example:
421421

422422
```rust
423423
#![warn(rustdoc::redundant_explicit_links)] // note: unnecessary - warns by default.

src/doc/rustdoc/src/write-documentation/linking-to-items-by-name.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -168,4 +168,4 @@ render differently in this case:
168168
```
169169

170170
`1.` and `2.` will be displayed as is in the rendered documentation (ie, `[a]` and `[b][c]`)
171-
whereas `3.` and `4.` will be replaced by a link targetting `e` for `[d](e)` and `g` for `[f]`.
171+
whereas `3.` and `4.` will be replaced by a link targeting `e` for `[d](e)` and `g` for `[f]`.

src/librustdoc/lint.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ declare_rustdoc_lint! {
187187

188188
declare_rustdoc_lint! {
189189
/// This lint is **warn-by-default**. It detects explicit links that are the same
190-
/// as computed automatic links. This usually means the explicit links are removeable.
190+
/// as computed automatic links. This usually means the explicit links are removable.
191191
/// This is a `rustdoc` only lint, see the documentation in the [rustdoc book].
192192
///
193193
/// [rustdoc book]: ../../../rustdoc/lints.html#redundant_explicit_links

src/rustdoc-json-types/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ pub enum StructKind {
314314
/// All [`Id`]'s will point to [`ItemEnum::StructField`]. Private and
315315
/// `#[doc(hidden)]` fields will be given as `None`
316316
Tuple(Vec<Option<Id>>),
317-
/// A struct with nammed fields.
317+
/// A struct with named fields.
318318
///
319319
/// ```rust
320320
/// pub struct PlainStruct { x: i32 }

0 commit comments

Comments
 (0)