feat: add cargo pkgid support for cargo-script (#14961)

### What does this PR try to resolve? close #14831 In this PR, we added the `cargo pkgid` support for the cargo-script. For the package itself: ```console cargo pkgid --manifest-path foo.rs path+file:///my-project/foo.rs/foo#0.86.0 ``` For its dependence: ```console cargo pkgid --manifest-path foo.rs -p sqlx registry+https://github.com/rust-lang/crates.io-index#[email protected] ``` ### How should we test and review this PR? I have updated the unit tests and also added more test cases for it. ### Additional information None
rust-lang · Feb 4, 2025 · f651497 · f651497
2 parents 83c11ee + 9fe45b2
commit f651497
Show file tree

Hide file tree

Showing 9 changed files with 170 additions and 65 deletions.
diff --git a/src/bin/cargo/commands/pkgid.rs b/src/bin/cargo/commands/pkgid.rs
@@ -18,13 +18,6 @@ pub fn cli() -> Command {
 
 pub fn exec(gctx: &mut GlobalContext, args: &ArgMatches) -> CliResult {
     let ws = args.workspace(gctx)?;
-    if ws.root_maybe().is_embedded() {
-        return Err(anyhow::format_err!(
-            "{} is unsupported by `cargo pkgid`",
-            ws.root_manifest().display()
-        )
-        .into());
-    }
     if args.is_present_with_zero_values("package") {
         print_available_packages(&ws)?
     }

diff --git a/src/cargo/core/source_id.rs b/src/cargo/core/source_id.rs
@@ -393,6 +393,9 @@ impl SourceId {
                     .url
                     .to_file_path()
                     .expect("path sources cannot be remote");
+                if crate::util::toml::is_embedded(&path) {
+                    anyhow::bail!("Single file packages cannot be used as dependencies")
+                }
                 Ok(Box::new(PathSource::new(&path, self, gctx)))
             }
             SourceKind::Registry | SourceKind::SparseRegistry => Ok(Box::new(

diff --git a/src/cargo/core/workspace.rs b/src/cargo/core/workspace.rs
@@ -269,10 +269,11 @@ impl<'gctx> Workspace<'gctx> {
         let mut ws = Workspace::new_default(package.manifest_path().to_path_buf(), gctx);
         ws.is_ephemeral = true;
         ws.require_optional_deps = require_optional_deps;
-        let key = ws.current_manifest.parent().unwrap();
         let id = package.package_id();
         let package = MaybePackage::Package(package);
-        ws.packages.packages.insert(key.to_path_buf(), package);
+        ws.packages
+            .packages
+            .insert(ws.current_manifest.clone(), package);
         ws.target_dir = if let Some(dir) = target_dir {
             Some(dir)
         } else {
@@ -538,11 +539,7 @@ impl<'gctx> Workspace<'gctx> {
     /// Returns a mutable iterator over all packages in this workspace
     pub fn members_mut(&mut self) -> impl Iterator<Item = &mut Package> {
         let packages = &mut self.packages.packages;
-        let members: HashSet<_> = self
-            .members
-            .iter()
-            .map(|path| path.parent().unwrap().to_owned())
-            .collect();
+        let members: HashSet<_> = self.members.iter().map(|path| path).collect();
 
         packages.iter_mut().filter_map(move |(path, package)| {
             if members.contains(path) {
@@ -1163,7 +1160,6 @@ impl<'gctx> Workspace<'gctx> {
 
     pub fn emit_warnings(&self) -> CargoResult<()> {
         for (path, maybe_pkg) in &self.packages.packages {
-            let path = path.join("Cargo.toml");
             if let MaybePackage::Package(pkg) = maybe_pkg {
                 if self.gctx.cli_unstable().cargo_lints {
                     self.emit_lints(pkg, &path)?
@@ -1792,19 +1788,22 @@ impl<'gctx> Packages<'gctx> {
     }
 
     fn maybe_get(&self, manifest_path: &Path) -> Option<&MaybePackage> {
-        self.packages.get(manifest_path.parent().unwrap())
+        self.packages.get(manifest_path)
     }
 
     fn maybe_get_mut(&mut self, manifest_path: &Path) -> Option<&mut MaybePackage> {
-        self.packages.get_mut(manifest_path.parent().unwrap())
+        self.packages.get_mut(manifest_path)
     }
 
     fn load(&mut self, manifest_path: &Path) -> CargoResult<&MaybePackage> {
-        let key = manifest_path.parent().unwrap();
-        match self.packages.entry(key.to_path_buf()) {
+        match self.packages.entry(manifest_path.to_path_buf()) {
             Entry::Occupied(e) => Ok(e.into_mut()),
             Entry::Vacant(v) => {
-                let source_id = SourceId::for_path(key)?;
+                let source_id = if crate::util::toml::is_embedded(manifest_path) {
+                    SourceId::for_path(manifest_path)?
+                } else {
+                    SourceId::for_path(manifest_path.parent().unwrap())?
+                };
                 let manifest = read_manifest(manifest_path, source_id, self.gctx)?;
                 Ok(v.insert(match manifest {
                     EitherManifest::Real(manifest) => {

diff --git a/tests/testsuite/alt_registry.rs b/tests/testsuite/alt_registry.rs
@@ -182,8 +182,8 @@ fn depend_on_alt_registry_depends_on_crates_io() {
 [DOWNLOADED] bar v0.0.1 (registry `alternative`)
 [CHECKING] baz v0.0.1
 [CHECKING] bar v0.0.1 (registry `alternative`)
-[CHECKING] foo v0.0.1 ([ROOT]/foo)
 [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
+[CHECKING] foo v0.0.1 ([ROOT]/foo)
 
 "#]]
             .unordered(),
@@ -441,8 +441,8 @@ fn alt_registry_and_crates_io_deps() {
 [DOWNLOADED] alt_reg_dep v0.1.0 (registry `alternative`)
 [CHECKING] crates_io_dep v0.0.1
 [CHECKING] alt_reg_dep v0.1.0 (registry `alternative`)
-[CHECKING] foo v0.0.1 ([ROOT]/foo)
 [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
+[CHECKING] foo v0.0.1 ([ROOT]/foo)
 
 "#]]
             .unordered(),

diff --git a/tests/testsuite/artifact_dep.rs b/tests/testsuite/artifact_dep.rs
@@ -602,9 +602,9 @@ fn build_script_with_bin_artifacts() {
         .with_stderr_data(
             str![[r#"
 [LOCKING] 1 package to latest compatible version
-[COMPILING] foo v0.0.0 ([ROOT]/foo)
 [COMPILING] bar v0.5.0 ([ROOT]/foo/bar)
 [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
+[COMPILING] foo v0.0.0 ([ROOT]/foo)
 
 "#]]
             .unordered(),
@@ -1433,7 +1433,6 @@ fn profile_override_basic() {
             str![[r#"
 [LOCKING] 1 package to latest compatible version
 [COMPILING] bar v0.5.0 ([ROOT]/foo/bar)
-[COMPILING] foo v0.0.1 ([ROOT]/foo)
 [RUNNING] `rustc --crate-name build_script_build [..] -C opt-level=1 [..]`
 [RUNNING] `rustc --crate-name bar --edition=2015 bar/src/main.rs [..] -C opt-level=3 [..]`
 [RUNNING] `rustc --crate-name bar --edition=2015 bar/src/main.rs [..] -C opt-level=1 [..]`
@@ -1442,6 +1441,7 @@ fn profile_override_basic() {
 [RUNNING] `rustc --crate-name foo [..] -C opt-level=3 [..]`
 [RUNNING] `[ROOT]/foo/target/debug/build/foo-[HASH]/build-script-build`
 [FINISHED] `dev` profile [optimized + debuginfo] target(s) in [ELAPSED]s
+[COMPILING] foo v0.0.1 ([ROOT]/foo)
 
 "#]]
             .unordered(),
@@ -1870,8 +1870,8 @@ fn allow_dep_renames_with_multiple_versions() {
 [DOWNLOADED] bar v1.0.0 (registry `dummy-registry`)
 [COMPILING] bar v1.0.0
 [COMPILING] bar v0.5.0 ([ROOT]/foo/bar)
-[COMPILING] foo v0.0.0 ([ROOT]/foo)
 [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
+[COMPILING] foo v0.0.0 ([ROOT]/foo)
 
 "#]]
             .unordered(),
@@ -2835,13 +2835,13 @@ fn with_assumed_host_target_and_optional_build_dep() {
         .with_stderr_data(
             str![[r#"
 [LOCKING] 1 package to latest compatible version
-[COMPILING] foo v0.0.1 ([ROOT]/foo)
 [COMPILING] d1 v0.0.1 ([ROOT]/foo/d1)
 [RUNNING] `rustc --crate-name build_script_build --edition=2021 [..]--crate-type bin[..]
 [RUNNING] `rustc --crate-name d1 --edition=2021 [..]--crate-type bin[..]
 [RUNNING] `[ROOT]/foo/target/debug/build/foo-[HASH]/build-script-build`
 [RUNNING] `rustc --crate-name foo --edition=2021 [..]--cfg[..]d1[..]
 [FINISHED] `dev` profile [..]
+[COMPILING] foo v0.0.1 ([ROOT]/foo)
 
 "#]]
             .unordered(),
@@ -3199,8 +3199,8 @@ fn decouple_same_target_transitive_dep_from_artifact_dep_and_proc_macro() {
 [COMPILING] b v0.1.0 ([ROOT]/foo/b)
 [COMPILING] c v0.1.0 ([ROOT]/foo/c)
 [COMPILING] bar v0.1.0 ([ROOT]/foo/bar)
-[COMPILING] foo v0.1.0 ([ROOT]/foo)
 [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [..]
+[COMPILING] foo v0.1.0 ([ROOT]/foo)
 
 "#]]
             .unordered(),

diff --git a/tests/testsuite/bad_config.rs b/tests/testsuite/bad_config.rs
@@ -1814,13 +1814,13 @@ fn workspace_default_features2() {
     p.cargo("check")
         .with_stderr_data(
             str![[r#"
-[WARNING] [ROOT]/foo/workspace_only/Cargo.toml: `default_features` is deprecated in favor of `default-features` and will not work in the 2024 edition
 (in the `dep_workspace_only` dependency)
 [CHECKING] dep_package_only v0.1.0 ([ROOT]/foo/dep_package_only)
 [CHECKING] dep_workspace_only v0.1.0 ([ROOT]/foo/dep_workspace_only)
 [CHECKING] package_only v0.1.0 ([ROOT]/foo/package_only)
 [CHECKING] workspace_only v0.1.0 ([ROOT]/foo/workspace_only)
 [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
+[WARNING] [ROOT]/foo/workspace_only/Cargo.toml: `default_features` is deprecated in favor of `default-features` and will not work in the 2024 edition
 
 "#]]
             .unordered(),

diff --git a/tests/testsuite/fix.rs b/tests/testsuite/fix.rs
@@ -2479,7 +2479,7 @@ fn main() {
         .with_stderr_data(str![[r#"
 [MIGRATING] foo.rs from 2021 edition to 2024
 [FIXED] foo.rs (1 fix)
-[CHECKING] foo v0.0.0 ([ROOT]/foo)
+[CHECKING] foo v0.0.0 ([ROOT]/foo/foo.rs)
 [MIGRATING] [ROOT]/home/.cargo/target/[HASH]/foo.rs from 2021 edition to 2024
 [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s
 

diff --git a/tests/testsuite/open_namespaces.rs b/tests/testsuite/open_namespaces.rs
@@ -289,7 +289,7 @@ fn main() {}
   "edition": "2021",
   "features": {},
   "homepage": null,
-  "id": "path+[ROOTURL]/foo#foo::[email protected]",
+  "id": "path+[ROOTURL]/foo/foo::bar.rs#foo::[email protected]",
   "keywords": [],
   "license": null,
   "license_file": null,