Skip to content

Commit 591c961

Browse files
committed
feat(resolve): Report incompatible with rustc when MSRV-resolve disabled
1 parent b8a4f1b commit 591c961

File tree

3 files changed

+14
-2
lines changed

3 files changed

+14
-2
lines changed

src/cargo/ops/cargo_update.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1121,5 +1121,9 @@ fn annotate_required_rust_version(
11211121
.map(|(dep, _)| (Some(required_rust_version.clone()), dep)),
11221122
);
11231123
}
1124+
} else {
1125+
for change in changes.values_mut() {
1126+
change.required_rust_version = rustc_version.clone();
1127+
}
11241128
}
11251129
}

tests/testsuite/cargo_add/rustc_ignore/stderr.term.svg

Lines changed: 6 additions & 2 deletions
Loading

tests/testsuite/rust_version.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,8 @@ fn lint_dep_incompatible_with_rust_version() {
157157
.with_stderr_data(str![[r#"
158158
[UPDATING] `dummy-registry` index
159159
[LOCKING] 3 packages to latest compatible versions
160+
[ADDING] too_new_child v0.0.1 (requires Rust 1.2345.0)
161+
[ADDING] too_new_parent v0.0.1 (requires Rust 1.2345.0)
160162
161163
"#]])
162164
.run();
@@ -296,6 +298,8 @@ fn resolve_with_rustc() {
296298
.with_stderr_data(str![[r#"
297299
[UPDATING] `dummy-registry` index
298300
[LOCKING] 2 packages to latest compatible versions
301+
[ADDING] newer-and-older v1.6.0 (requires Rust 1.2345)
302+
[ADDING] only-newer v1.6.0 (requires Rust 1.2345)
299303
300304
"#]])
301305
.run();

0 commit comments

Comments
 (0)