Auto merge of #13128 - epage:schema, r=weihanglo

refactor: Pull PackageIdSpec into schema

### What does this PR try to resolve?

This removes one of the remaining ties `util_schemas` has on the rest of cargo as part of #12801.

### How should we test and review this PR?

This is broken up into small commits

### Additional information

Author: bors

src/bin/cargo/commands/remove.rs

@@ -1,5 +1,6 @@
 use cargo::core::dependency::DepKind;
 use cargo::core::PackageIdSpec;
+use cargo::core::PackageIdSpecQuery;
 use cargo::core::Resolve;
 use cargo::core::Workspace;
 use cargo::ops::cargo_remove::remove;

src/cargo/core/mod.rs

@@ -4,16 +4,17 @@ pub use self::manifest::{EitherManifest, VirtualManifest};
 pub use self::manifest::{Manifest, Target, TargetKind};
 pub use self::package::{Package, PackageSet};
 pub use self::package_id::PackageId;
-pub use self::package_id_spec::PackageIdSpec;
+pub use self::package_id_spec::PackageIdSpecQuery;
 pub use self::registry::Registry;
 pub use self::resolver::{Resolve, ResolveVersion};
 pub use self::shell::{Shell, Verbosity};
-pub use self::source_id::{GitReference, SourceId, SourceKind};
+pub use self::source_id::SourceId;
 pub use self::summary::{FeatureMap, FeatureValue, Summary};
 pub use self::workspace::{
     find_workspace_root, resolve_relative_path, MaybePackage, Workspace, WorkspaceConfig,
     WorkspaceRootConfig,
 };
+pub use crate::util_schemas::core::{GitReference, PackageIdSpec, SourceKind};
 
 pub mod compiler;
 pub mod dependency;

src/cargo/core/package_id.rs

@@ -10,6 +10,7 @@ use std::sync::OnceLock;
 use serde::de;
 use serde::ser;
 
+use crate::core::PackageIdSpec;
 use crate::core::SourceId;
 use crate::util::interning::InternedString;
 use crate::util::CargoResult;
@@ -186,6 +187,15 @@ impl PackageId {
     pub fn tarball_name(&self) -> String {
         format!("{}-{}.crate", self.name(), self.version())
     }
+
+    /// Convert a `PackageId` to a `PackageIdSpec`, which will have both the `PartialVersion` and `Url`
+    /// fields filled in.
+    pub fn to_spec(&self) -> PackageIdSpec {
+        PackageIdSpec::new(String::from(self.name().as_str()))
+            .with_version(self.version().clone().into())
+            .with_url(self.source_id().url().clone())
+            .with_kind(self.source_id().kind().clone())
+    }
 }
 
 pub struct PackageIdStableHash<'a>(PackageId, &'a Path);