diff --git a/src/cargo/core/profiles.rs b/src/cargo/core/profiles.rs index de660380431..3c4c457c158 100644 --- a/src/cargo/core/profiles.rs +++ b/src/cargo/core/profiles.rs @@ -623,10 +623,10 @@ pub struct Profile { pub incremental: bool, pub panic: PanicStrategy, pub strip: Strip, - #[serde(skip_serializing_if = "Vec::is_empty")] // remove when `rustflags` is stablized + #[serde(skip_serializing_if = "Vec::is_empty")] // remove when `rustflags` is stabilized // Note that `rustflags` is used for the cargo-feature `profile_rustflags` pub rustflags: Vec, - // remove when `-Ztrim-paths` is stablized + // remove when `-Ztrim-paths` is stabilized #[serde(skip_serializing_if = "Option::is_none")] pub trim_paths: Option, #[serde(skip_serializing_if = "Option::is_none")] diff --git a/src/cargo/ops/vendor.rs b/src/cargo/ops/vendor.rs index 9906c2af509..174c969b32a 100644 --- a/src/cargo/ops/vendor.rs +++ b/src/cargo/ops/vendor.rs @@ -293,7 +293,7 @@ fn sync( registry.unpack_package_in(id, staging_dir.path(), &vendor_this)?; if let Err(e) = fs::rename(&unpacked_src, &dst) { // This fallback is mainly for Windows 10 versions earlier than 1607. - // The destination of `fs::rename` can't be a diretory in older versions. + // The destination of `fs::rename` can't be a directory in older versions. // Can be removed once the minimal supported Windows version gets bumped. tracing::warn!("failed to `mv {unpacked_src:?} {dst:?}`: {e}"); let paths: Vec<_> = walkdir(&unpacked_src).map(|e| e.into_path()).collect(); diff --git a/src/cargo/util/semver_eval_ext.rs b/src/cargo/util/semver_eval_ext.rs index 1a32d30382c..4cb09e9fb53 100644 --- a/src/cargo/util/semver_eval_ext.rs +++ b/src/cargo/util/semver_eval_ext.rs @@ -384,7 +384,7 @@ mod matches_prerelease_semantic { #[test] fn test_less_upper_bound() { - // Lower bound without prerelase tag, so upper bound equivalent to 1.2.3, <2"), req(">1.2.3, <2.0"), @@ -396,7 +396,7 @@ mod matches_prerelease_semantic { assert_match_none(r, &["2.0.0-0", "2.0.0", "2.1.2"]); } - // Lower bound has prerelase tag, so upper bound doesn't change. + // Lower bound has prerelease tag, so upper bound doesn't change. for r in &[ req(">1.2.3-0, <2"), req(">1.2.3-0, <2.0"), diff --git a/tests/build-std/main.rs b/tests/build-std/main.rs index d6f533a9c32..3ce8b200e3c 100644 --- a/tests/build-std/main.rs +++ b/tests/build-std/main.rs @@ -48,7 +48,7 @@ trait BuildStd: Sized { /// /// The environment is not isolated is to avoid excessive network requests /// and downloads. A side effect is `[BLOCKING]` will show up in stderr, - /// as a sign of package cahce lock contention when running other build-std + /// as a sign of package cache lock contention when running other build-std /// tests concurrently. fn build_std(&mut self) -> &mut Self;