From 632bf2ba2499dbedcb315ef9cc69f5e2143171f4 Mon Sep 17 00:00:00 2001
From: Vincent Esche <regexident@gmail.com>
Date: Tue, 3 Dec 2024 10:32:11 +0100
Subject: [PATCH 1/2] Make `Dependency`'s `source` member the same type as
 `Package`'s `source` member: `Option<Source>`

---
 CHANGELOG.md          | 1 +
 src/dependency.rs     | 4 +++-
 tests/test_samples.rs | 6 ++++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 308e1bf2..de91cefb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@
 - Updated dependencies:
   - `thiserror` from `1.0.31` to `2.0.3`
   - `derive_builder` from `0.12` to `0.20`
+- Made `Dependency`'s `source` member the same type as `Package`'s `source` member: `Option<Source>`.
 
 ### Removed
 
diff --git a/src/dependency.rs b/src/dependency.rs
index 293b9d9a..cf39eed8 100644
--- a/src/dependency.rs
+++ b/src/dependency.rs
@@ -51,7 +51,7 @@ pub struct Dependency {
     /// Name as given in the `Cargo.toml`
     pub name: String,
     /// The source of dependency
-    pub source: Option<String>,
+    pub source: Option<Source>,
     /// The required version
     pub req: VersionReq,
     /// The kind of dependency this is
@@ -83,3 +83,5 @@ pub struct Dependency {
 }
 
 pub use cargo_platform::Platform;
+
+use crate::Source;
diff --git a/tests/test_samples.rs b/tests/test_samples.rs
index 2f406c5b..c7f25fd6 100644
--- a/tests/test_samples.rs
+++ b/tests/test_samples.rs
@@ -6,7 +6,7 @@ extern crate serde_json;
 use camino::Utf8PathBuf;
 use cargo_metadata::{
     workspace_default_members_is_missing, ArtifactDebuginfo, CargoOpt, DependencyKind, Edition,
-    Message, Metadata, MetadataCommand,
+    Message, Metadata, MetadataCommand, Source,
 };
 
 /// Output from oldest version ever supported (1.24).
@@ -240,7 +240,9 @@ fn all_the_fields() {
         .unwrap();
     assert_eq!(
         bitflags.source,
-        Some("registry+https://github.com/rust-lang/crates.io-index".to_string())
+        Some(Source {
+            repr: "registry+https://github.com/rust-lang/crates.io-index".to_string()
+        })
     );
     assert!(bitflags.optional);
     assert_eq!(bitflags.req, semver::VersionReq::parse("^1.0").unwrap());

From b77a322a235782d4987d35aeefef4db9afbeafd5 Mon Sep 17 00:00:00 2001
From: Vincent Esche <regexident@gmail.com>
Date: Tue, 3 Dec 2024 14:16:25 +0100
Subject: [PATCH 2/2] Move import further up

---
 src/dependency.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/dependency.rs b/src/dependency.rs
index cf39eed8..09b88501 100644
--- a/src/dependency.rs
+++ b/src/dependency.rs
@@ -8,6 +8,8 @@ use derive_builder::Builder;
 use semver::VersionReq;
 use serde::{Deserialize, Deserializer, Serialize};
 
+use crate::Source;
+
 #[derive(Eq, PartialEq, Clone, Debug, Copy, Hash, Serialize, Deserialize, Default)]
 /// Dependencies can come in three kinds
 pub enum DependencyKind {
@@ -83,5 +85,3 @@ pub struct Dependency {
 }
 
 pub use cargo_platform::Platform;
-
-use crate::Source;