push the rest of the clones to the bottom

rust-lang · Jan 29, 2019 · 192073b · 192073b
1 parent 4fb53e5
commit 192073b
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 15 deletions.
diff --git a/src/cargo/core/registry.rs b/src/cargo/core/registry.rs
@@ -304,9 +304,7 @@ impl<'cfg> PackageRegistry<'cfg> {
     fn load(&mut self, source_id: SourceId, kind: Kind) -> CargoResult<()> {
         (|| {
             debug!("loading source {}", source_id);
-            let source = self
-                .source_config
-                .load(source_id, self.yanked_whitelist.clone())?;
+            let source = self.source_config.load(source_id, &self.yanked_whitelist)?;
             assert_eq!(source.source_id(), source_id);
 
             if kind == Kind::Override {

diff --git a/src/cargo/core/source/source_id.rs b/src/cargo/core/source/source_id.rs
@@ -261,7 +261,7 @@ impl SourceId {
     pub fn load<'a>(
         self,
         config: &'a Config,
-        yanked_whitelist: HashSet<PackageId>,
+        yanked_whitelist: &HashSet<PackageId>,
     ) -> CargoResult<Box<dyn super::Source + 'a>> {
         trace!("loading SourceId; {}", self);
         match self.inner.kind {

diff --git a/src/cargo/ops/cargo_install.rs b/src/cargo/ops/cargo_install.rs
@@ -181,7 +181,7 @@ fn install_one(
         })?
     } else {
         select_pkg(
-            map.load(source_id, HashSet::new())?,
+            map.load(source_id, &HashSet::new())?,
             krate,
             vers,
             config,

diff --git a/src/cargo/ops/registry.rs b/src/cargo/ops/registry.rs
@@ -350,7 +350,7 @@ pub fn registry(
     let token = token.or(token_config);
     let sid = get_source_id(config, index_config.or(index), registry)?;
     let api_host = {
-        let mut src = RegistrySource::remote(sid, HashSet::new(), config);
+        let mut src = RegistrySource::remote(sid, &HashSet::new(), config);
         // Only update the index if the config is not available or `force` is set.
         let cfg = src.config();
         let cfg = if force_update || cfg.is_err() {
@@ -696,7 +696,7 @@ fn get_source_id(
         (_, Some(i)) => SourceId::for_registry(&i.to_url()?),
         _ => {
             let map = SourceConfigMap::new(config)?;
-            let src = map.load(SourceId::crates_io(config)?, HashSet::new())?;
+            let src = map.load(SourceId::crates_io(config)?, &HashSet::new())?;
             Ok(src.replaced_source_id())
         }
     }

diff --git a/src/cargo/sources/config.rs b/src/cargo/sources/config.rs
@@ -76,7 +76,7 @@ impl<'cfg> SourceConfigMap<'cfg> {
     pub fn load(
         &self,
         id: SourceId,
-        yanked_whitelist: HashSet<PackageId>,
+        yanked_whitelist: &HashSet<PackageId>,
     ) -> CargoResult<Box<dyn Source + 'cfg>> {
         debug!("loading: {}", id);
         let mut name = match self.id2name.get(&id) {
@@ -120,8 +120,8 @@ impl<'cfg> SourceConfigMap<'cfg> {
                 )
             }
         }
-        let new_src = new_id.load(self.config, yanked_whitelist.clone())?;
-        let old_src = id.load(self.config, yanked_whitelist.clone())?;
+        let new_src = new_id.load(self.config, yanked_whitelist)?;
+        let old_src = id.load(self.config, yanked_whitelist)?;
         if !new_src.supports_checksums() && old_src.supports_checksums() {
             failure::bail!(
                 "\

diff --git a/src/cargo/sources/registry/mod.rs b/src/cargo/sources/registry/mod.rs
@@ -389,7 +389,7 @@ fn short_name(id: SourceId) -> String {
 impl<'cfg> RegistrySource<'cfg> {
     pub fn remote(
         source_id: SourceId,
-        yanked_whitelist: HashSet<PackageId>,
+        yanked_whitelist: &HashSet<PackageId>,
         config: &'cfg Config,
     ) -> RegistrySource<'cfg> {
         let name = short_name(source_id);
@@ -412,7 +412,7 @@ impl<'cfg> RegistrySource<'cfg> {
             config,
             &name,
             Box::new(ops),
-            HashSet::new(),
+            &HashSet::new(),
             false,
         )
     }
@@ -422,7 +422,7 @@ impl<'cfg> RegistrySource<'cfg> {
         config: &'cfg Config,
         name: &str,
         ops: Box<dyn RegistryData + 'cfg>,
-        yanked_whitelist: HashSet<PackageId>,
+        yanked_whitelist: &HashSet<PackageId>,
         index_locked: bool,
     ) -> RegistrySource<'cfg> {
         RegistrySource {
@@ -431,7 +431,7 @@ impl<'cfg> RegistrySource<'cfg> {
             source_id,
             updated: false,
             index: index::RegistryIndex::new(source_id, ops.index_path(), config, index_locked),
-            yanked_whitelist,
+            yanked_whitelist: yanked_whitelist.clone(),
             index_locked,
             ops,
         }

diff --git a/tests/testsuite/search.rs b/tests/testsuite/search.rs
@@ -108,7 +108,7 @@ fn not_update() {
 
     let sid = SourceId::for_registry(&registry_url()).unwrap();
     let cfg = Config::new(Shell::new(), paths::root(), paths::home().join(".cargo"));
-    let mut regsrc = RegistrySource::remote(sid, HashSet::new(), &cfg);
+    let mut regsrc = RegistrySource::remote(sid, &HashSet::new(), &cfg);
     regsrc.update().unwrap();
 
     cargo_process("search postgres")