Skip to content

Commit

Permalink
fix(add): Don't talk about rustc version as if its msrv
Browse files Browse the repository at this point in the history
  • Loading branch information
epage committed Mar 1, 2024
1 parent 910f56b commit 55d3d65
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions src/cargo/ops/cargo_add/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -661,7 +661,7 @@ help: pass `--ignore-rust-version` to select {dep_name}@{latest_version} which r
} else {
anyhow::format_err!(
"\
no version of crate `{dep_name}` can maintain {name}'s rust-version of {req_msrv}
no version of crate `{dep_name}` is compatible with rustc {req_msrv}
help: pass `--ignore-rust-version` to select {dep_name}@{latest_version} which requires rustc {latest_msrv}"
)
}
Expand All @@ -679,7 +679,7 @@ ignoring {dependency}@{latest_version} (which requires rustc {latest_rust_versio
} else {
gctx.shell().warn(format_args!(
"\
ignoring {dependency}@{latest_version} (which requires rustc {latest_rust_version}) to maintain {name}'s rust-version of {req_msrv}",
ignoring {dependency}@{latest_version} (which requires rustc {latest_rust_version}) as it is incompatible with rustc {req_msrv}",
))?;
}

Expand Down
4 changes: 2 additions & 2 deletions tests/testsuite/cargo_add/rustc_incompatible/stderr.term.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions tests/testsuite/cargo_add/rustc_latest/stderr.term.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions tests/testsuite/cargo_add/rustc_older/stderr.term.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 55d3d65

Please sign in to comment.