Skip to content

Commit ce3c14a

Browse files
committed
Auto merge of #13714 - guqicun:master, r=weihanglo
chore: fix some typos
2 parents 28e7b2b + 6631435 commit ce3c14a

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

src/cargo/core/compiler/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1238,7 +1238,7 @@ fn trim_paths_args(
12381238
return Ok(());
12391239
}
12401240

1241-
// feature gate was checked during mainfest/config parsing.
1241+
// feature gate was checked during manifest/config parsing.
12421242
cmd.arg("-Zunstable-options");
12431243
cmd.arg(format!("-Zremap-path-scope={trim_paths}"));
12441244

src/cargo/core/features.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ macro_rules! features {
377377
activated: Vec<String>,
378378
/// Whether is allowed to use any unstable features.
379379
nightly_features_allowed: bool,
380-
/// Whether the source mainfest is from a local package.
380+
/// Whether the source manifest is from a local package.
381381
is_local: bool,
382382
}
383383

src/cargo/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
//! - [`util`]:
4646
//! This directory contains generally-useful utility modules.
4747
//! - [`util::context`]:
48-
//! This directory contains the global applicaton context.
48+
//! This directory contains the global application context.
4949
//! This includes the config parser which makes heavy use of
5050
//! [serde](https://serde.rs/) to merge and translate config values.
5151
//! The [`util::GlobalContext`] is usually accessed from the

src/cargo/ops/cargo_add/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,7 @@ fn check_invalid_ws_keys(toml_key: &str, arg: &DepOp) -> CargoResult<()> {
487487
}
488488

489489
/// When the `--optional` option is added using `cargo add`, we need to
490-
/// check the current rust-version. As the `dep:` syntax is only avaliable
490+
/// check the current rust-version. As the `dep:` syntax is only available
491491
/// starting with Rust 1.60.0
492492
///
493493
/// `true` means that the rust-version is None or the rust-version is higher

src/cargo/sources/git/source.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ impl<'gctx> GitSource<'gctx> {
101101
assert!(source_id.is_git(), "id is not git, id={}", source_id);
102102

103103
let remote = GitRemote::new(source_id.url());
104-
// Fallback to git ref from mainfest if there is no locked revision.
104+
// Fallback to git ref from manifest if there is no locked revision.
105105
let locked_rev = source_id
106106
.precise_git_fragment()
107107
.map(|s| Revision::new(s.into()))

src/doc/src/reference/unstable.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ Take for example this `Cargo.toml`.
347347
my-dependency = "0.1.1"
348348
```
349349

350-
It's possible to update `my-dependancy` to a pre-release with `update -Zunstable-options my-dependency --precise 0.1.2-pre.0`.
350+
It's possible to update `my-dependency` to a pre-release with `update -Zunstable-options my-dependency --precise 0.1.2-pre.0`.
351351
This is because `0.1.2-pre.0` is considered compatible with `0.1.1`.
352352
It would not be possible to upgrade to `0.2.0-pre.0` from `0.1.1` in the same way.
353353

0 commit comments

Comments
 (0)