Skip to content

Commit 05066fe

Browse files
committed
Auto merge of #13831 - weihanglo:typos, r=Muscraft
docs: fix several typos found by `typos-cli`
2 parents c10b6d3 + 7a33639 commit 05066fe

File tree

8 files changed

+10
-10
lines changed

8 files changed

+10
-10
lines changed

CHANGELOG.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
[#13664](https://github.com/rust-lang/cargo/pull/13664)
6565
- cargo-init: don't assign `target.name` in Cargo.toml if the value can be inferred.
6666
[#13606](https://github.com/rust-lang/cargo/pull/13606)
67-
- carog-package: normalize paths in `Cargo.toml`, including replacing `\` with `/`.
67+
- cargo-package: normalize paths in `Cargo.toml`, including replacing `\` with `/`.
6868
[#13729](https://github.com/rust-lang/cargo/pull/13729)
6969
- cargo-test: recategorize cargo test's `--doc` flag under “Target Selection”.
7070
[#13756](https://github.com/rust-lang/cargo/pull/13756)
@@ -1178,7 +1178,7 @@
11781178
[#12332](https://github.com/rust-lang/cargo/pull/12332)
11791179
- ❗️ `cargo login` no longer accept any token after the `--` syntax.
11801180
Arguments after `--` are now reserved in the preparation of the new credential provider feature.
1181-
This introduces a regression that overlooks the `cargo login -- <token>` support in preivous versions.
1181+
This introduces a regression that overlooks the `cargo login -- <token>` support in previous versions.
11821182
[#12499](https://github.com/rust-lang/cargo/pull/12499)
11831183
- Make Cargo `--help` easier to browse.
11841184
[#11905](https://github.com/rust-lang/cargo/pull/11905)

src/cargo/core/features.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
//! * Good for: `.cargo/config.toml`, `config.json` index file (gate: `-Z`)
2828
//!
2929
//! For features that touch multiple parts of Cargo, multiple feature gating strategies (error,
30-
//! warn, ignore) and mechnisms (`-Z`, `cargo-features`) may be used.
30+
//! warn, ignore) and mechanisms (`-Z`, `cargo-features`) may be used.
3131
//!
3232
//! When adding new tests for your feature, usually the tests should go into a
3333
//! new module of the testsuite named after the feature. See
@@ -513,7 +513,7 @@ features! {
513513

514514
/// Status and metadata for a single unstable feature.
515515
pub struct Feature {
516-
/// Feature name. This is valid Rust identifer so no dash only underscore.
516+
/// Feature name. This is valid Rust identifier so no dash only underscore.
517517
name: &'static str,
518518
stability: Status,
519519
/// Version that this feature was stabilized or removed.

src/cargo/sources/registry/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -967,7 +967,7 @@ impl RegistryConfig {
967967
const NAME: &'static str = "config.json";
968968
}
969969

970-
/// Get the maximum upack size that Cargo permits
970+
/// Get the maximum unpack size that Cargo permits
971971
/// based on a given `size` of your compressed file.
972972
///
973973
/// Returns the larger one between `size * max compression ratio`

src/cargo/util/cache_lock.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,7 @@ impl CacheLocker {
513513
///
514514
/// Note that `Shared` will return true if a `MutateExclusive` lock is
515515
/// held, since `MutateExclusive` is just an upgraded `Shared`. Likewise,
516-
/// `DownlaodExclusive` will return true if a `MutateExclusive` lock is
516+
/// `DownloadExclusive` will return true if a `MutateExclusive` lock is
517517
/// held since they overlap.
518518
pub fn is_locked(&self, mode: CacheLockMode) -> bool {
519519
let state = self.state.borrow();

src/doc/man/cargo-update.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ While not recommended, you can specify a yanked version of a package (nightly on
4747
When possible, try other non-yanked SemVer-compatible versions or seek help
4848
from the maintainers of the package.
4949

50-
A compatible `pre-release` version can also be specified even when the version requirement in `Cargo.toml` doesn't contain any pre-release identifer (nightly only).
50+
A compatible `pre-release` version can also be specified even when the version requirement in `Cargo.toml` doesn't contain any pre-release identifier (nightly only).
5151
{{/option}}
5252

5353
{{#option "`-w`" "`--workspace`" }}

src/doc/man/generated_txt/cargo-update.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ OPTIONS
4242

4343
A compatible pre-release version can also be specified even when the
4444
version requirement in Cargo.toml doesn’t contain any pre-release
45-
identifer (nightly only).
45+
identifier (nightly only).
4646

4747
-w, --workspace
4848
Attempt to update only packages defined in the workspace. Other

src/doc/src/commands/cargo-update.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ revision (such as a SHA hash or tag).</p>
4343
<p>While not recommended, you can specify a yanked version of a package (nightly only).
4444
When possible, try other non-yanked SemVer-compatible versions or seek help
4545
from the maintainers of the package.</p>
46-
<p>A compatible <code>pre-release</code> version can also be specified even when the version requirement in <code>Cargo.toml</code> doesn’t contain any pre-release identifer (nightly only).</dd>
46+
<p>A compatible <code>pre-release</code> version can also be specified even when the version requirement in <code>Cargo.toml</code> doesn’t contain any pre-release identifier (nightly only).</dd>
4747

4848

4949
<dt class="option-term" id="option-cargo-update--w"><a class="option-anchor" href="#option-cargo-update--w"></a><code>-w</code></dt>

src/etc/man/cargo-update.1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ While not recommended, you can specify a yanked version of a package (nightly on
4444
When possible, try other non\-yanked SemVer\-compatible versions or seek help
4545
from the maintainers of the package.
4646
.sp
47-
A compatible \fBpre\-release\fR version can also be specified even when the version requirement in \fBCargo.toml\fR doesn\[cq]t contain any pre\-release identifer (nightly only).
47+
A compatible \fBpre\-release\fR version can also be specified even when the version requirement in \fBCargo.toml\fR doesn\[cq]t contain any pre\-release identifier (nightly only).
4848
.RE
4949
.sp
5050
\fB\-w\fR,

0 commit comments

Comments
 (0)