feat(cli): emit error when add is given a toolchain name instead of a crate name

This commit is contained in:
Danil Hendra Suryawan 2023-06-03 07:04:12 +07:00
parent 1548f3bec4
commit a9c47cc3ab
7 changed files with 45 additions and 0 deletions

View File

@ -242,7 +242,20 @@ fn parse_dependencies(config: &Config, matches: &ArgMatches) -> CargoResult<Vec<
.flatten()
.map(|c| (Some(c.clone()), None))
.collect::<IndexMap<_, _>>();
let mut infer_crate_name = false;
for (crate_name, _) in crates.iter() {
let crate_name = crate_name.as_ref().unwrap();
if let Some(toolchain) = crate_name.strip_prefix("+") {
anyhow::bail!(
"invalid character `+` in dependency name: `+{toolchain}`
Use `cargo +{toolchain} add` if you meant to use the `{toolchain}` toolchain."
);
}
}
if crates.is_empty() {
if path.is_some() || git.is_some() {
crates.insert(None, None);

View File

@ -0,0 +1 @@
../add-basic.in

View File

@ -0,0 +1,23 @@
use cargo_test_support::compare::assert_ui;
use cargo_test_support::prelude::*;
use cargo_test_support::Project;
use cargo_test_support::curr_dir;
#[cargo_test]
fn case() {
let project = Project::from_template(curr_dir!().join("in"));
let project_root = project.root();
let cwd = &project_root;
snapbox::cmd::Command::cargo_ui()
.arg("add")
.arg_line("+nightly")
.current_dir(cwd)
.assert()
.failure()
.stdout_matches_path(curr_dir!().join("stdout.log"))
.stderr_matches_path(curr_dir!().join("stderr.log"));
assert_ui().subset_matches(curr_dir!().join("out"), &project_root);
}

View File

@ -0,0 +1,5 @@
[workspace]
[package]
name = "cargo-list-test-fixture"
version = "0.0.0"

View File

@ -0,0 +1,2 @@
error: invalid character `+` in dependency name: `+nightly`
Use `cargo +nightly add` if you meant to use the `nightly` toolchain.

View File

@ -1,6 +1,7 @@
mod add_basic;
mod add_multiple;
mod add_normalized_name_external;
mod add_toolchain;
mod build;
mod build_prefer_existing_version;
mod change_rename_target;