mirror of https://github.com/rust-lang/cargo
Auto merge of #13714 - guqicun:master, r=weihanglo
chore: fix some typos
This commit is contained in:
commit
ce3c14aaa6
|
@ -1238,7 +1238,7 @@ fn trim_paths_args(
|
|||
return Ok(());
|
||||
}
|
||||
|
||||
// feature gate was checked during mainfest/config parsing.
|
||||
// feature gate was checked during manifest/config parsing.
|
||||
cmd.arg("-Zunstable-options");
|
||||
cmd.arg(format!("-Zremap-path-scope={trim_paths}"));
|
||||
|
||||
|
|
|
@ -377,7 +377,7 @@ macro_rules! features {
|
|||
activated: Vec<String>,
|
||||
/// Whether is allowed to use any unstable features.
|
||||
nightly_features_allowed: bool,
|
||||
/// Whether the source mainfest is from a local package.
|
||||
/// Whether the source manifest is from a local package.
|
||||
is_local: bool,
|
||||
}
|
||||
|
||||
|
|
|
@ -45,7 +45,7 @@
|
|||
//! - [`util`]:
|
||||
//! This directory contains generally-useful utility modules.
|
||||
//! - [`util::context`]:
|
||||
//! This directory contains the global applicaton context.
|
||||
//! This directory contains the global application context.
|
||||
//! This includes the config parser which makes heavy use of
|
||||
//! [serde](https://serde.rs/) to merge and translate config values.
|
||||
//! The [`util::GlobalContext`] is usually accessed from the
|
||||
|
|
|
@ -487,7 +487,7 @@ fn check_invalid_ws_keys(toml_key: &str, arg: &DepOp) -> CargoResult<()> {
|
|||
}
|
||||
|
||||
/// When the `--optional` option is added using `cargo add`, we need to
|
||||
/// check the current rust-version. As the `dep:` syntax is only avaliable
|
||||
/// check the current rust-version. As the `dep:` syntax is only available
|
||||
/// starting with Rust 1.60.0
|
||||
///
|
||||
/// `true` means that the rust-version is None or the rust-version is higher
|
||||
|
|
|
@ -101,7 +101,7 @@ impl<'gctx> GitSource<'gctx> {
|
|||
assert!(source_id.is_git(), "id is not git, id={}", source_id);
|
||||
|
||||
let remote = GitRemote::new(source_id.url());
|
||||
// Fallback to git ref from mainfest if there is no locked revision.
|
||||
// Fallback to git ref from manifest if there is no locked revision.
|
||||
let locked_rev = source_id
|
||||
.precise_git_fragment()
|
||||
.map(|s| Revision::new(s.into()))
|
||||
|
|
|
@ -347,7 +347,7 @@ Take for example this `Cargo.toml`.
|
|||
my-dependency = "0.1.1"
|
||||
```
|
||||
|
||||
It's possible to update `my-dependancy` to a pre-release with `update -Zunstable-options my-dependency --precise 0.1.2-pre.0`.
|
||||
It's possible to update `my-dependency` to a pre-release with `update -Zunstable-options my-dependency --precise 0.1.2-pre.0`.
|
||||
This is because `0.1.2-pre.0` is considered compatible with `0.1.1`.
|
||||
It would not be possible to upgrade to `0.2.0-pre.0` from `0.1.1` in the same way.
|
||||
|
||||
|
|
Loading…
Reference in New Issue