From bd31d7c5992065b4357cee4b10dcccda36bf89e0 Mon Sep 17 00:00:00 2001 From: Weihang Lo Date: Mon, 29 Apr 2024 23:05:41 -0400 Subject: [PATCH 1/3] docs(changelog): typo fixes --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c2bf51ed6e2..a94f71f6221 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -64,7 +64,7 @@ [#13664](https://github.com/rust-lang/cargo/pull/13664) - cargo-init: don't assign `target.name` in Cargo.toml if the value can be inferred. [#13606](https://github.com/rust-lang/cargo/pull/13606) -- carog-package: normalize paths in `Cargo.toml`, including replacing `\` with `/`. +- cargo-package: normalize paths in `Cargo.toml`, including replacing `\` with `/`. [#13729](https://github.com/rust-lang/cargo/pull/13729) - cargo-test: recategorize cargo test's `--doc` flag under “Target Selection”. [#13756](https://github.com/rust-lang/cargo/pull/13756) @@ -1178,7 +1178,7 @@ [#12332](https://github.com/rust-lang/cargo/pull/12332) - ❗️ `cargo login` no longer accept any token after the `--` syntax. Arguments after `--` are now reserved in the preparation of the new credential provider feature. - This introduces a regression that overlooks the `cargo login -- ` support in preivous versions. + This introduces a regression that overlooks the `cargo login -- ` support in previous versions. [#12499](https://github.com/rust-lang/cargo/pull/12499) - Make Cargo `--help` easier to browse. [#11905](https://github.com/rust-lang/cargo/pull/11905) From 16bc8720b7cc89fa1d970535223778e5b46d8483 Mon Sep 17 00:00:00 2001 From: Weihang Lo Date: Mon, 29 Apr 2024 23:07:44 -0400 Subject: [PATCH 2/3] docs(man): typo fixes --- src/doc/man/cargo-update.md | 2 +- src/doc/man/generated_txt/cargo-update.txt | 2 +- src/doc/src/commands/cargo-update.md | 2 +- src/etc/man/cargo-update.1 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/doc/man/cargo-update.md b/src/doc/man/cargo-update.md index ce62269f902..c3ba31971c1 100644 --- a/src/doc/man/cargo-update.md +++ b/src/doc/man/cargo-update.md @@ -47,7 +47,7 @@ While not recommended, you can specify a yanked version of a package (nightly on When possible, try other non-yanked SemVer-compatible versions or seek help from the maintainers of the package. -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). +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). {{/option}} {{#option "`-w`" "`--workspace`" }} diff --git a/src/doc/man/generated_txt/cargo-update.txt b/src/doc/man/generated_txt/cargo-update.txt index 1d5541042cb..bcfcf296b39 100644 --- a/src/doc/man/generated_txt/cargo-update.txt +++ b/src/doc/man/generated_txt/cargo-update.txt @@ -42,7 +42,7 @@ OPTIONS 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). + identifier (nightly only). -w, --workspace Attempt to update only packages defined in the workspace. Other diff --git a/src/doc/src/commands/cargo-update.md b/src/doc/src/commands/cargo-update.md index 27a9f815ddc..c34f91168f9 100644 --- a/src/doc/src/commands/cargo-update.md +++ b/src/doc/src/commands/cargo-update.md @@ -43,7 +43,7 @@ revision (such as a SHA hash or tag).

While not recommended, you can specify a yanked version of a package (nightly only). When possible, try other non-yanked SemVer-compatible versions or seek help from the maintainers of the package.

-

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). +

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).

-w
diff --git a/src/etc/man/cargo-update.1 b/src/etc/man/cargo-update.1 index 56407d02338..f8468059f1c 100644 --- a/src/etc/man/cargo-update.1 +++ b/src/etc/man/cargo-update.1 @@ -44,7 +44,7 @@ While not recommended, you can specify a yanked version of a package (nightly on When possible, try other non\-yanked SemVer\-compatible versions or seek help from the maintainers of the package. .sp -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). +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). .RE .sp \fB\-w\fR, From 7a33639876112bf5335fdffb920ee9d121a96706 Mon Sep 17 00:00:00 2001 From: Weihang Lo Date: Mon, 29 Apr 2024 23:08:14 -0400 Subject: [PATCH 3/3] docs: doc comments typo fixes --- src/cargo/core/features.rs | 4 ++-- src/cargo/sources/registry/mod.rs | 2 +- src/cargo/util/cache_lock.rs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/cargo/core/features.rs b/src/cargo/core/features.rs index e4d559c963c..7013cc2a458 100644 --- a/src/cargo/core/features.rs +++ b/src/cargo/core/features.rs @@ -27,7 +27,7 @@ //! * Good for: `.cargo/config.toml`, `config.json` index file (gate: `-Z`) //! //! For features that touch multiple parts of Cargo, multiple feature gating strategies (error, -//! warn, ignore) and mechnisms (`-Z`, `cargo-features`) may be used. +//! warn, ignore) and mechanisms (`-Z`, `cargo-features`) may be used. //! //! When adding new tests for your feature, usually the tests should go into a //! new module of the testsuite named after the feature. See @@ -513,7 +513,7 @@ features! { /// Status and metadata for a single unstable feature. pub struct Feature { - /// Feature name. This is valid Rust identifer so no dash only underscore. + /// Feature name. This is valid Rust identifier so no dash only underscore. name: &'static str, stability: Status, /// Version that this feature was stabilized or removed. diff --git a/src/cargo/sources/registry/mod.rs b/src/cargo/sources/registry/mod.rs index 93e35abeff8..0c9326cdd09 100644 --- a/src/cargo/sources/registry/mod.rs +++ b/src/cargo/sources/registry/mod.rs @@ -967,7 +967,7 @@ impl RegistryConfig { const NAME: &'static str = "config.json"; } -/// Get the maximum upack size that Cargo permits +/// Get the maximum unpack size that Cargo permits /// based on a given `size` of your compressed file. /// /// Returns the larger one between `size * max compression ratio` diff --git a/src/cargo/util/cache_lock.rs b/src/cargo/util/cache_lock.rs index 6e0249cc9e6..e4a10375701 100644 --- a/src/cargo/util/cache_lock.rs +++ b/src/cargo/util/cache_lock.rs @@ -513,7 +513,7 @@ impl CacheLocker { /// /// Note that `Shared` will return true if a `MutateExclusive` lock is /// held, since `MutateExclusive` is just an upgraded `Shared`. Likewise, - /// `DownlaodExclusive` will return true if a `MutateExclusive` lock is + /// `DownloadExclusive` will return true if a `MutateExclusive` lock is /// held since they overlap. pub fn is_locked(&self, mode: CacheLockMode) -> bool { let state = self.state.borrow();