From: Dale Wijnand Date: Fri, 4 May 2018 14:24:08 +0000 (+0100) Subject: Trash RegistryBuilder, dead cfg(test) code X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~1^2~17^2 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=05e819427c64cbbda5bc8f8d752980afaf0abae8;p=cargo.git Trash RegistryBuilder, dead cfg(test) code --- diff --git a/src/cargo/core/registry.rs b/src/cargo/core/registry.rs index 95b49053f..904179c7a 100644 --- a/src/cargo/core/registry.rs +++ b/src/cargo/core/registry.rs @@ -605,73 +605,3 @@ fn lock(locked: &LockedMap, patches: &HashMap>, summary: Sum dep }) } - -#[cfg(test)] -pub mod test { - use core::{Dependency, Registry, Summary}; - use util::CargoResult; - - pub struct RegistryBuilder { - summaries: Vec, - overrides: Vec, - } - - impl RegistryBuilder { - pub fn new() -> RegistryBuilder { - RegistryBuilder { - summaries: vec![], - overrides: vec![], - } - } - - pub fn summary(mut self, summary: Summary) -> RegistryBuilder { - self.summaries.push(summary); - self - } - - pub fn summaries(mut self, summaries: Vec) -> RegistryBuilder { - self.summaries.extend(summaries.into_iter()); - self - } - - pub fn add_override(mut self, summary: Summary) -> RegistryBuilder { - self.overrides.push(summary); - self - } - - pub fn overrides(mut self, summaries: Vec) -> RegistryBuilder { - self.overrides.extend(summaries.into_iter()); - self - } - - fn query_overrides(&self, dep: &Dependency) -> Vec { - self.overrides - .iter() - .filter(|s| s.name() == dep.name()) - .map(|s| s.clone()) - .collect() - } - } - - impl Registry for RegistryBuilder { - fn query(&mut self, dep: &Dependency, f: &mut FnMut(Summary)) -> CargoResult<()> { - debug!("querying; dep={:?}", dep); - - let overrides = self.query_overrides(dep); - - if overrides.is_empty() { - for s in self.summaries.iter() { - if dep.matches(s) { - f(s.clone()); - } - } - Ok(()) - } else { - for s in overrides { - f(s); - } - Ok(()) - } - } - } -}