rust
/
cargo
mirror of https://github.com/rust-lang/cargo
0
0
Fork 0
Code Issues Releases Wiki Activity

fix cargo -p

This commit is contained in:
likzn 2022-05-18 22:40:55 +08:00
parent 6d6dd9d9be
commit 95cb21d6a1
3 changed files with 179 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/cargo/core/workspace.rs
View File

@ -1449,6 +1449,7 @@ impl<'cfg> Workspace<'cfg> {
let ms: Vec<_> = self
.members()
.filter(|m| specs.iter().any(|spec| spec.matches(m.package_id())))
.filter_map(|member| {
let member_id = member.package_id();
match self.current_opt() {

34
src/cargo/ops/cargo_compile.rs
View File

@ -146,10 +146,15 @@ impl Packages {
emit_pattern_not_found(ws, patterns, true).or_else(warn)?;
specs
}
Packages::Packages(packages) if packages.is_empty() => {
vec![PackageIdSpec::from_package_id(ws.current()?.package_id())]
}
Packages::Packages(opt_in) => {
if ws.is_virtual() {
bail!("can't use \"--package <SPEC>\" in virtual manifest")
}
if opt_in.is_empty() {
return Ok(vec![PackageIdSpec::from_package_id(
ws.current()?.package_id(),
)]);
}
let (mut patterns, packages) = opt_patterns_and_names(opt_in)?;
let mut specs = packages
.iter()
@ -164,6 +169,25 @@ impl Packages {
specs.extend(matched_pkgs);
}
emit_pattern_not_found(ws, patterns, false)?;
let matched_packages = ws
.members()
.filter(|m| specs.iter().any(|spec| spec.matches(m.package_id())))
.collect::<Vec<_>>();
if matched_packages.is_empty() {
bail!(
"not found `{}` in manifest members. Check in manifest path `{}`",
opt_in.get(0).unwrap(),
ws.root().display()
)
}
if matched_packages.len() > 1 {
bail!(
"found mutilate `{}` in manifest members. Check in manifest path `{}`",
opt_in.get(0).unwrap(),
ws.root().display()
)
}
specs
}
Packages::Default => ws
@ -174,13 +198,13 @@ impl Packages {
};
if specs.is_empty() {
if ws.is_virtual() {
anyhow::bail!(
bail!(
"manifest path `{}` contains no package: The manifest is virtual, \
and the workspace has no members.",
ws.root().display()
)
}
anyhow::bail!("no packages to compile")
bail!("no packages to compile")
}
Ok(specs)
}

193
tests/testsuite/publish.rs
View File

@ -56,7 +56,7 @@ fn validate_upload_foo() {
);
}
fn validate_upload_bar() {
fn validate_upload_li() {
publish::validate_upload(
r#"
{
@ -64,7 +64,7 @@ fn validate_upload_bar() {
"badges": {},
"categories": [],
"deps": [],
"description": "bar",
"description": "li",
"documentation": null,
"features": {},
"homepage": null,
@ -72,14 +72,14 @@ fn validate_upload_bar() {
"license": "MIT",
"license_file": null,
"links": null,
"name": "bar",
"name": "li",
"readme": null,
"readme_file": null,
"repository": null,
"vers": "0.0.1"
}
"#,
"bar-0.0.1.crate",
"li-0.0.1.crate",
&["Cargo.lock", "Cargo.toml", "Cargo.toml.orig", "src/main.rs"],
);
}
@ -1665,7 +1665,52 @@ Caused by:
}
#[cargo_test]
fn in_workspace() {
fn in_package_workspace() {
registry::init();
let p = project()
.file(
"Cargo.toml",
r#"
[package]
name = "foo"
version = "0.1.0"
edition = "2018"
[workspace]
members = ["li"]
"#,
)
.file("src/main.rs", "fn main() {}")
.file(
"li/Cargo.toml",
r#"
[package]
name = "li"
version = "0.0.1"
description = "li"
license = "MIT"
"#,
)
.file("li/src/main.rs", "fn main() {}")
.build();
p.cargo("publish -p li --no-verify --token sekrit")
.with_stderr(
"\
[UPDATING] [..]
[WARNING] manifest has no documentation, homepage or repository.
See [..]
[PACKAGING] li v0.0.1 ([CWD]/li)
[UPLOADING] li v0.0.1 ([CWD]/li)
",
)
.run();
validate_upload_li();
}
#[cargo_test]
fn in_virtual_workspace() {
registry::init();
let p = project()
@ -1673,7 +1718,7 @@ fn in_workspace() {
"Cargo.toml",
r#"
[workspace]
members = ["foo", "bar"]
members = ["foo"]
"#,
)
.file(
@ -1688,46 +1733,106 @@ fn in_workspace() {
"#,
)
.file("foo/src/main.rs", "fn main() {}")
.file(
"bar/Cargo.toml",
r#"
[project]
name = "bar"
version = "0.0.1"
authors = []
license = "MIT"
description = "bar"
workspace = ".."
"#,
)
.file("bar/src/main.rs", "fn main() {}")
.build();
p.cargo("publish --no-verify --token sekrit -p foo")
.with_stderr(
"\
[UPDATING] [..]
[WARNING] manifest has no documentation, [..]
See [..]
[PACKAGING] foo v0.0.1 ([CWD]/foo)
[UPLOADING] foo v0.0.1 ([CWD]/foo)
",
)
.with_status(101)
.with_stderr("error: can't use \"--package <SPEC>\" in virtual manifest")
.run();
}
#[cargo_test]
fn in_package_workspace_not_found() {
registry::init();
let p = project()
.file(
"Cargo.toml",
r#"
[package]
name = "foo"
version = "0.1.0"
edition = "2018"
[workspace]
"#,
)
.file("src/main.rs", "fn main() {}")
.file(
"li/Cargo.toml",
r#"
[package]
name = "li"
version = "0.0.1"
edition = "2021"
authors = []
license = "MIT"
description = "li"
"#,
)
.file("li/src/main.rs", "fn main() {}")
.build();
p.cargo("publish -p li --no-verify --token sekrit ")
.with_status(101)
.with_stderr(
"\
error: not found `li` in manifest members. Check in manifest path `[CWD]`
",
)
.run();
}
#[cargo_test]
fn in_package_workspace_found_mutilate() {
registry::init();
let p = project()
.file(
"Cargo.toml",
r#"
[package]
name = "foo"
version = "0.1.0"
edition = "2018"
[workspace]
members = ["li","lii"]
"#,
)
.file("src/main.rs", "fn main() {}")
.file(
"li/Cargo.toml",
r#"
[package]
name = "li"
version = "0.0.1"
edition = "2021"
authors = []
license = "MIT"
description = "li"
"#,
)
.file("li/src/main.rs", "fn main() {}")
.file(
"lii/Cargo.toml",
r#"
[package]
name = "lii"
version = "0.0.1"
edition = "2021"
authors = []
license = "MIT"
description = "lii"
"#,
)
.file("lii/src/main.rs", "fn main() {}")
.build();
p.cargo("publish -p li* --no-verify --token sekrit ")
.with_status(101)
.with_stderr(
"\
error: found mutilate `li*` in manifest members. Check in manifest path `[CWD]`
",
)
.run();
validate_upload_foo();
p.cargo("publish --no-verify --token sekrit -p bar")
.with_stderr(
"\
[UPDATING] [..]
[WARNING] manifest has no documentation, [..]
See [..]
[PACKAGING] bar v0.0.1 ([CWD]/bar)
[UPLOADING] bar v0.0.1 ([CWD]/bar)
",
)
.run();
validate_upload_bar();
}