mirror of
https://github.com/rust-lang/cargo
synced 2024-10-13 19:22:33 +00:00
fix: Allow embedded manifests in all commands
I originally centralized the error reporting until I realized it likely is intentionally not centralized so we report errors in terms of the arguments the user provided.
This commit is contained in:
Ed Page
parent
2cd89e3c25
commit
4e49af4071
|
|
@ -343,7 +343,7 @@ pub trait ArgMatchesExt {
|
|||
// In general, we try to avoid normalizing paths in Cargo,
|
||||
// but in this particular case we need it to fix #3586.
|
||||
let path = paths::normalize_path(&path);
|
||||
if !path.ends_with("Cargo.toml") {
|
||||
if !path.ends_with("Cargo.toml") && !crate::util::toml::is_embedded(&path) {
|
||||
anyhow::bail!("the manifest-path must be a path to a Cargo.toml file")
|
||||
}
|
||||
if !path.exists() {
|
||||
|
|
|
|||
|
|
@ -75,9 +75,11 @@ pub fn read_manifest(
|
|||
}
|
||||
|
||||
/// See also `bin/cargo/commands/run.rs`s `is_manifest_command`
|
||||
fn is_embedded(path: &Path) -> bool {
|
||||
pub fn is_embedded(path: &Path) -> bool {
|
||||
let ext = path.extension();
|
||||
ext.is_none() || ext == Some(OsStr::new("rs"))
|
||||
ext == Some(OsStr::new("rs")) ||
|
||||
// Provide better errors by not considering directories to be embedded manifests
|
||||
(ext.is_none() && path.is_file())
|
||||
}
|
||||
|
||||
/// Parse an already-loaded `Cargo.toml` as a Cargo manifest.
|
||||
|
|
|
|||
|
|
@ -634,10 +634,15 @@ fn cmd_check_with_embedded() {
|
|||
|
||||
p.cargo("-Zscript check --manifest-path script.rs")
|
||||
.masquerade_as_nightly_cargo(&["script"])
|
||||
.with_status(101)
|
||||
.with_stdout(
|
||||
"\
|
||||
",
|
||||
)
|
||||
.with_stderr(
|
||||
"\
|
||||
[ERROR] the manifest-path must be a path to a Cargo.toml file
|
||||
[WARNING] `package.edition` is unspecifiead, defaulting to `2021`
|
||||
[CHECKING] script v0.0.0 ([ROOT]/foo)
|
||||
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
|
||||
",
|
||||
)
|
||||
.run();
|
||||
|
|
@ -652,10 +657,15 @@ fn cmd_build_with_embedded() {
|
|||
|
||||
p.cargo("-Zscript build --manifest-path script.rs")
|
||||
.masquerade_as_nightly_cargo(&["script"])
|
||||
.with_status(101)
|
||||
.with_stdout(
|
||||
"\
|
||||
",
|
||||
)
|
||||
.with_stderr(
|
||||
"\
|
||||
[ERROR] the manifest-path must be a path to a Cargo.toml file
|
||||
[WARNING] `package.edition` is unspecifiead, defaulting to `2021`
|
||||
[COMPILING] script v0.0.0 ([ROOT]/foo)
|
||||
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
|
||||
",
|
||||
)
|
||||
.run();
|
||||
|
|
@ -670,10 +680,21 @@ fn cmd_test_with_embedded() {
|
|||
|
||||
p.cargo("-Zscript test --manifest-path script.rs")
|
||||
.masquerade_as_nightly_cargo(&["script"])
|
||||
.with_status(101)
|
||||
.with_stdout(
|
||||
"
|
||||
running 1 test
|
||||
test test ... ok
|
||||
|
||||
test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in [..]s
|
||||
|
||||
",
|
||||
)
|
||||
.with_stderr(
|
||||
"\
|
||||
[ERROR] the manifest-path must be a path to a Cargo.toml file
|
||||
[WARNING] `package.edition` is unspecifiead, defaulting to `2021`
|
||||
[COMPILING] script v0.0.0 ([ROOT]/foo)
|
||||
[FINISHED] test [unoptimized + debuginfo] target(s) in [..]s
|
||||
[RUNNING] unittests script.rs ([..])
|
||||
",
|
||||
)
|
||||
.run();
|
||||
|
|
@ -693,10 +714,13 @@ fn cmd_clean_with_embedded() {
|
|||
|
||||
p.cargo("-Zscript clean --manifest-path script.rs")
|
||||
.masquerade_as_nightly_cargo(&["script"])
|
||||
.with_status(101)
|
||||
.with_stdout(
|
||||
"\
|
||||
",
|
||||
)
|
||||
.with_stderr(
|
||||
"\
|
||||
[ERROR] the manifest-path must be a path to a Cargo.toml file
|
||||
[WARNING] `package.edition` is unspecifiead, defaulting to `2021`
|
||||
",
|
||||
)
|
||||
.run();
|
||||
|
|
@ -711,10 +735,13 @@ fn cmd_generate_lockfile_with_embedded() {
|
|||
|
||||
p.cargo("-Zscript generate-lockfile --manifest-path script.rs")
|
||||
.masquerade_as_nightly_cargo(&["script"])
|
||||
.with_status(101)
|
||||
.with_stdout(
|
||||
"\
|
||||
",
|
||||
)
|
||||
.with_stderr(
|
||||
"\
|
||||
[ERROR] the manifest-path must be a path to a Cargo.toml file
|
||||
[WARNING] `package.edition` is unspecifiead, defaulting to `2021`
|
||||
",
|
||||
)
|
||||
.run();
|
||||
|
|
@ -729,10 +756,77 @@ fn cmd_metadata_with_embedded() {
|
|||
|
||||
p.cargo("-Zscript metadata --manifest-path script.rs --format-version=1")
|
||||
.masquerade_as_nightly_cargo(&["script"])
|
||||
.with_status(101)
|
||||
.with_json(
|
||||
r#"
|
||||
{
|
||||
"packages": [
|
||||
{
|
||||
"authors": [
|
||||
],
|
||||
"categories": [],
|
||||
"default_run": null,
|
||||
"name": "script",
|
||||
"version": "0.0.0",
|
||||
"id": "script[..]",
|
||||
"keywords": [],
|
||||
"source": null,
|
||||
"dependencies": [],
|
||||
"edition": "[..]",
|
||||
"license": null,
|
||||
"license_file": null,
|
||||
"links": null,
|
||||
"description": null,
|
||||
"readme": null,
|
||||
"repository": null,
|
||||
"rust_version": null,
|
||||
"homepage": null,
|
||||
"documentation": null,
|
||||
"homepage": null,
|
||||
"documentation": null,
|
||||
"targets": [
|
||||
{
|
||||
"kind": [
|
||||
"bin"
|
||||
],
|
||||
"crate_types": [
|
||||
"bin"
|
||||
],
|
||||
"doc": true,
|
||||
"doctest": false,
|
||||
"test": true,
|
||||
"edition": "[..]",
|
||||
"name": "script",
|
||||
"src_path": "[..]/script.rs"
|
||||
}
|
||||
],
|
||||
"features": {},
|
||||
"manifest_path": "[..]script.rs",
|
||||
"metadata": null,
|
||||
"publish": []
|
||||
}
|
||||
],
|
||||
"workspace_members": ["script 0.0.0 (path+file:[..]foo)"],
|
||||
"workspace_default_members": ["script 0.0.0 (path+file:[..]foo)"],
|
||||
"resolve": {
|
||||
"nodes": [
|
||||
{
|
||||
"dependencies": [],
|
||||
"deps": [],
|
||||
"features": [],
|
||||
"id": "script 0.0.0 (path+file:[..]foo)"
|
||||
}
|
||||
],
|
||||
"root": "script 0.0.0 (path+file:[..]foo)"
|
||||
},
|
||||
"target_directory": "[ROOT]/home/.cargo/target/[..]",
|
||||
"version": 1,
|
||||
"workspace_root": "[..]/foo",
|
||||
"metadata": null
|
||||
}"#,
|
||||
)
|
||||
.with_stderr(
|
||||
"\
|
||||
[ERROR] the manifest-path must be a path to a Cargo.toml file
|
||||
[WARNING] `package.edition` is unspecifiead, defaulting to `2021`
|
||||
",
|
||||
)
|
||||
.run();
|
||||
|
|
@ -747,10 +841,48 @@ fn cmd_read_manifest_with_embedded() {
|
|||
|
||||
p.cargo("-Zscript read-manifest --manifest-path script.rs")
|
||||
.masquerade_as_nightly_cargo(&["script"])
|
||||
.with_status(101)
|
||||
.with_json(
|
||||
r#"
|
||||
{
|
||||
"authors": [
|
||||
],
|
||||
"categories": [],
|
||||
"default_run": null,
|
||||
"name":"script",
|
||||
"readme": null,
|
||||
"homepage": null,
|
||||
"documentation": null,
|
||||
"repository": null,
|
||||
"rust_version": null,
|
||||
"version":"0.0.0",
|
||||
"id":"script[..]0.0.0[..](path+file://[..]/foo)",
|
||||
"keywords": [],
|
||||
"license": null,
|
||||
"license_file": null,
|
||||
"links": null,
|
||||
"description": null,
|
||||
"edition": "[..]",
|
||||
"source":null,
|
||||
"dependencies":[],
|
||||
"targets":[{
|
||||
"kind":["bin"],
|
||||
"crate_types":["bin"],
|
||||
"doc": true,
|
||||
"doctest": false,
|
||||
"test": true,
|
||||
"edition": "[..]",
|
||||
"name":"script",
|
||||
"src_path":"[..]/script.rs"
|
||||
}],
|
||||
"features":{},
|
||||
"manifest_path":"[..]script.rs",
|
||||
"metadata": null,
|
||||
"publish": []
|
||||
}"#,
|
||||
)
|
||||
.with_stderr(
|
||||
"\
|
||||
[ERROR] the manifest-path must be a path to a Cargo.toml file
|
||||
[WARNING] `package.edition` is unspecifiead, defaulting to `2021`
|
||||
",
|
||||
)
|
||||
.run();
|
||||
|
|
@ -764,10 +896,17 @@ fn cmd_run_with_embedded() {
|
|||
|
||||
p.cargo("-Zscript run --manifest-path script.rs")
|
||||
.masquerade_as_nightly_cargo(&["script"])
|
||||
.with_status(101)
|
||||
.with_stdout(
|
||||
r#"bin: [..]/debug/script[EXE]
|
||||
args: []
|
||||
"#,
|
||||
)
|
||||
.with_stderr(
|
||||
"\
|
||||
[ERROR] the manifest-path must be a path to a Cargo.toml file
|
||||
[WARNING] `package.edition` is unspecifiead, defaulting to `2021`
|
||||
[COMPILING] script v0.0.0 ([ROOT]/foo)
|
||||
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]s
|
||||
[RUNNING] `[..]/debug/script[EXE]`
|
||||
",
|
||||
)
|
||||
.run();
|
||||
|
|
@ -781,10 +920,14 @@ fn cmd_tree_with_embedded() {
|
|||
|
||||
p.cargo("-Zscript tree --manifest-path script.rs")
|
||||
.masquerade_as_nightly_cargo(&["script"])
|
||||
.with_status(101)
|
||||
.with_stdout(
|
||||
"\
|
||||
script v0.0.0 ([ROOT]/foo)
|
||||
",
|
||||
)
|
||||
.with_stderr(
|
||||
"\
|
||||
[ERROR] the manifest-path must be a path to a Cargo.toml file
|
||||
[WARNING] `package.edition` is unspecifiead, defaulting to `2021`
|
||||
",
|
||||
)
|
||||
.run();
|
||||
|
|
@ -798,10 +941,13 @@ fn cmd_update_with_embedded() {
|
|||
|
||||
p.cargo("-Zscript update --manifest-path script.rs")
|
||||
.masquerade_as_nightly_cargo(&["script"])
|
||||
.with_status(101)
|
||||
.with_stdout(
|
||||
"\
|
||||
",
|
||||
)
|
||||
.with_stderr(
|
||||
"\
|
||||
[ERROR] the manifest-path must be a path to a Cargo.toml file
|
||||
[WARNING] `package.edition` is unspecifiead, defaulting to `2021`
|
||||
",
|
||||
)
|
||||
.run();
|
||||
|
|
@ -815,7 +961,11 @@ fn cmd_verify_project_with_embedded() {
|
|||
|
||||
p.cargo("-Zscript verify-project --manifest-path script.rs")
|
||||
.masquerade_as_nightly_cargo(&["script"])
|
||||
.with_status(1)
|
||||
.with_stdout(r#"{"invalid":"the manifest-path must be a path to a Cargo.toml file"}"#)
|
||||
.with_json(r#"{"success":"true"}"#)
|
||||
.with_stderr(
|
||||
"\
|
||||
[WARNING] `package.edition` is unspecifiead, defaulting to `2021`
|
||||
",
|
||||
)
|
||||
.run();
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue