refactor(spec): Allow tracking the kind

Author: epage

src/cargo/core/mod.rs

@@ -8,7 +8,7 @@ pub use self::package_id_spec::PackageIdSpec;
 pub use self::registry::Registry;
 pub use self::resolver::{Resolve, ResolveVersion};
 pub use self::shell::{Shell, Verbosity};
-pub use self::source_id::{GitReference, SourceId};
+pub use self::source_id::{GitReference, SourceId, SourceKind};
 pub use self::summary::{FeatureMap, FeatureValue, Summary};
 pub use self::workspace::{
     find_workspace_root, resolve_relative_path, MaybePackage, Workspace, WorkspaceConfig,

src/cargo/core/package_id_spec.rs

@@ -7,6 +7,7 @@ use serde::{de, ser};
 use url::Url;
 
 use crate::core::PackageId;
+use crate::core::SourceKind;
 use crate::util::edit_distance;
 use crate::util::errors::CargoResult;
 use crate::util::PartialVersion;
@@ -26,6 +27,7 @@ pub struct PackageIdSpec {
     name: String,
     version: Option<PartialVersion>,
     url: Option<Url>,
+    kind: Option<SourceKind>,
 }
 
 impl PackageIdSpec {
@@ -78,6 +80,7 @@ impl PackageIdSpec {
             name: String::from(name),
             version,
             url: None,
+            kind: None,
         })
     }
 
@@ -101,6 +104,7 @@ impl PackageIdSpec {
             name: String::from(package_id.name().as_str()),
             version: Some(package_id.version().clone().into()),
             url: Some(package_id.source_id().url().clone()),
+            kind: None,
         }
     }
 
@@ -144,6 +148,7 @@ impl PackageIdSpec {
             name,
             version,
             url: Some(url),
+            kind: None,
         })
     }
 
@@ -216,6 +221,7 @@ impl PackageIdSpec {
                         name: self.name.clone(),
                         version: self.version.clone(),
                         url: None,
+                        kind: None,
                     },
                     &mut suggestion,
                 );
@@ -226,6 +232,7 @@ impl PackageIdSpec {
                         name: self.name.clone(),
                         version: None,
                         url: None,
+                        kind: None,
                     },
                     &mut suggestion,
                 );
@@ -346,6 +353,7 @@ mod tests {
                 name: String::from("foo"),
                 version: None,
                 url: Some(Url::parse("https://crates.io/foo").unwrap()),
+                kind: None,
             },
             "https://crates.io/foo",
         );
@@ -355,6 +363,7 @@ mod tests {
                 name: String::from("foo"),
                 version: Some("1.2.3".parse().unwrap()),
                 url: Some(Url::parse("https://crates.io/foo").unwrap()),
+                kind: None,
             },
             "https://crates.io/foo#1.2.3",
         );
@@ -364,6 +373,7 @@ mod tests {
                 name: String::from("foo"),
                 version: Some("1.2".parse().unwrap()),
                 url: Some(Url::parse("https://crates.io/foo").unwrap()),
+                kind: None,
             },
             "https://crates.io/foo#1.2",
         );
@@ -373,6 +383,7 @@ mod tests {
                 name: String::from("bar"),
                 version: Some("1.2.3".parse().unwrap()),
                 url: Some(Url::parse("https://crates.io/foo").unwrap()),
+                kind: None,
             },
             "https://crates.io/foo#[email protected]",
         );
@@ -382,6 +393,7 @@ mod tests {
                 name: String::from("bar"),
                 version: Some("1.2.3".parse().unwrap()),
                 url: Some(Url::parse("https://crates.io/foo").unwrap()),
+                kind: None,
             },
             "https://crates.io/foo#[email protected]",
         );
@@ -391,6 +403,7 @@ mod tests {
                 name: String::from("bar"),
                 version: Some("1.2".parse().unwrap()),
                 url: Some(Url::parse("https://crates.io/foo").unwrap()),
+                kind: None,
             },
             "https://crates.io/foo#[email protected]",
         );
@@ -400,6 +413,7 @@ mod tests {
                 name: String::from("foo"),
                 version: None,
                 url: None,
+                kind: None,
             },
             "foo",
         );
@@ -409,6 +423,7 @@ mod tests {
                 name: String::from("foo"),
                 version: Some("1.2.3".parse().unwrap()),
                 url: None,
+                kind: None,
             },
             "[email protected]",
         );
@@ -418,6 +433,7 @@ mod tests {
                 name: String::from("foo"),
                 version: Some("1.2.3".parse().unwrap()),
                 url: None,
+                kind: None,
             },
             "[email protected]",
         );
@@ -427,6 +443,7 @@ mod tests {
                 name: String::from("foo"),
                 version: Some("1.2".parse().unwrap()),
                 url: None,
+                kind: None,
             },
             "[email protected]",
         );

src/cargo/core/source_id.rs

@@ -85,7 +85,7 @@ impl fmt::Display for Precise {
 /// The possible kinds of code source.
 /// Along with [`SourceIdInner`], this fully defines the source.
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
-enum SourceKind {
+pub enum SourceKind {
     /// A git repository.
     Git(GitReference),
     /// A local path.