Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/cargo/core/profiles.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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<InternedString>,
// remove when `-Ztrim-paths` is stablized
// remove when `-Ztrim-paths` is stabilized
#[serde(skip_serializing_if = "Option::is_none")]
pub trim_paths: Option<TomlTrimPaths>,
#[serde(skip_serializing_if = "Option::is_none")]
Expand Down
2 changes: 1 addition & 1 deletion src/cargo/ops/vendor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
4 changes: 2 additions & 2 deletions src/cargo/util/semver_eval_ext.rs
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ mod matches_prerelease_semantic {

#[test]
fn test_less_upper_bound() {
// Lower bound without prerelase tag, so upper bound equivalent to <I.J.K-0
// Lower bound without prerelease tag, so upper bound equivalent to <I.J.K-0
for r in &[
req(">1.2.3, <2"),
req(">1.2.3, <2.0"),
Expand All @@ -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"),
Expand Down
2 changes: 1 addition & 1 deletion tests/build-std/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down