diff --git a/src/cargo/ops/cargo_package.rs b/src/cargo/ops/cargo_package.rs index a699e58a6..1d63446ab 100644 --- a/src/cargo/ops/cargo_package.rs +++ b/src/cargo/ops/cargo_package.rs @@ -10,7 +10,7 @@ use crate::core::compiler::{BuildConfig, CompileMode, DefaultExecutor, Executor} use crate::core::manifest::Target; use crate::core::resolver::CliFeatures; use crate::core::{registry::PackageRegistry, resolver::HasDevUnits}; -use crate::core::{Feature, Shell, Verbosity, Workspace}; +use crate::core::{Feature, PackageIdSpecQuery, Shell, Verbosity, Workspace}; use crate::core::{Package, PackageId, PackageSet, Resolve, SourceId}; use crate::sources::PathSource; use crate::util::cache_lock::CacheLockMode; @@ -176,10 +176,15 @@ pub fn package_one( } pub fn package(ws: &Workspace<'_>, opts: &PackageOpts<'_>) -> CargoResult>> { - let pkgs = ws.members_with_features( - &opts.to_package.to_package_id_specs(ws)?, - &opts.cli_features, - )?; + let specs = &opts.to_package.to_package_id_specs(ws)?; + // If -p is used, we should check spec is matched with the members (See #13719) + if let ops::Packages::Packages(_) = opts.to_package { + for spec in specs.iter() { + let member_ids = ws.members().map(|p| p.package_id()); + spec.query(member_ids)?; + } + } + let pkgs = ws.members_with_features(specs, &opts.cli_features)?; let mut dsts = Vec::with_capacity(pkgs.len()); diff --git a/tests/testsuite/package.rs b/tests/testsuite/package.rs index 08662f1f9..a89075241 100644 --- a/tests/testsuite/package.rs +++ b/tests/testsuite/package.rs @@ -2658,28 +2658,13 @@ fn package_in_workspace_not_found() { .build(); p.cargo("package -p doesnt-exist") - .with_stderr( + .with_status(101) + .with_stderr_contains( "\ -[WARNING] manifest has no documentation, [..] -See [..] -[PACKAGING] bar v0.0.1 ([CWD]/bar) -[VERIFYING] bar v0.0.1 ([CWD]/bar) -[COMPILING] bar v0.0.1 ([CWD][..]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] -[PACKAGED] [..] files, [..] ([..] compressed) -[WARNING] manifest has no documentation, [..] -See [..] -[PACKAGING] baz v0.0.1 ([CWD]/baz) -[VERIFYING] baz v0.0.1 ([CWD]/baz) -[COMPILING] baz v0.0.1 ([CWD][..]) -[FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..] -[PACKAGED] [..] files, [..] ([..] compressed) +[ERROR] package ID specification `doesnt-exist` did not match any packages ", ) .run(); - - assert!(p.root().join("target/package/bar-0.0.1.crate").is_file()); - assert!(p.root().join("target/package/baz-0.0.1.crate").is_file()); } #[cargo_test]