refactor(spec): Make it easier to add more matches

epage · epage · commit 07244c37c06f · 2023-11-07T16:57:33.000-06:00
diff --git a/src/cargo/core/package_id_spec.rs b/src/cargo/core/package_id_spec.rs
@@ -180,10 +180,13 @@ impl PackageIdSpec {
             }
         }
 
-        match self.url {
-            Some(ref u) => u == package_id.source_id().url(),
-            None => true,
+        if let Some(u) = &self.url {
+            if u != package_id.source_id().url() {
+                return false;
+            }
         }
+
+        true
     }
 
     /// Checks a list of `PackageId`s to find 1 that matches this `PackageIdSpec`. If 0, 2, or

Original file line number	Diff line number	Diff line change
`@@ -180,10 +180,13 @@ impl PackageIdSpec {`
`180`	`180`	`}`
`181`	`181`	`}`
`182`	`182`
`183`		`- match self.url {`
`184`		`- Some(ref u) => u == package_id.source_id().url(),`
`185`		`- None => true,`
	`183`	`+ if let Some(u) = &self.url {`
	`184`	`+ if u != package_id.source_id().url() {`
	`185`	`+ return false;`
	`186`	`+ }`
`186`	`187`	`}`
	`188`	`+`
	`189`	`+ true`
`187`	`190`	`}`
`188`	`191`
`189`	`192`	/// Checks a list of `PackageId`s to find 1 that matches this `PackageIdSpec`. If 0, 2, or