Make SourceId derive Copy

dwijnand · dwijnand · commit 9b22eb199875 · 2018-11-25T13:44:06.000Z
diff --git a/src/cargo/core/source/source_id.rs b/src/cargo/core/source/source_id.rs
@@ -23,7 +23,7 @@ lazy_static! {
 }
 
 /// Unique identifier for a source of packages.
-#[derive(Clone, Eq, Debug)]
+#[derive(Clone, Copy, Eq, Debug)]
 pub struct SourceId {
     inner: &'static SourceIdInner,
 }
diff --git a/src/cargo/ops/resolve.rs b/src/cargo/ops/resolve.rs
@@ -150,7 +150,7 @@ pub fn resolve_with_previous<'a, 'cfg>(
     //
     // TODO: This seems like a hokey reason to single out the registry as being
     //       different
-    let mut to_avoid_sources = HashSet::new();
+    let mut to_avoid_sources: HashSet<&SourceId> = HashSet::new();
     if let Some(to_avoid) = to_avoid {
         to_avoid_sources.extend(
             to_avoid
@@ -161,7 +161,7 @@ pub fn resolve_with_previous<'a, 'cfg>(
     }
 
     let keep = |p: &&'a PackageId| {
-        !to_avoid_sources.contains(&p.source_id()) && match to_avoid {
+        !to_avoid_sources.contains(p.source_id()) && match to_avoid {
             Some(set) => !set.contains(p),
             None => true,
         }

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ lazy_static! {`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`/// Unique identifier for a source of packages.`
`26`		`-#[derive(Clone, Eq, Debug)]`
	`26`	`+#[derive(Clone, Copy, Eq, Debug)]`
`27`	`27`	`pub struct SourceId {`
`28`	`28`	`inner: &'static SourceIdInner,`
`29`	`29`	`}`