Re-organise Source impls method definition order

Optimised for minimised PR diff, and thus reviewability

diff --git a/src/cargo/core/source/mod.rs b/src/cargo/core/source/mod.rs
index 1c6eed63315d7c922d15bafb4ff12e4b7fb71c04..c36480aab2713a8f0806f4cbc72bdecee7475d5c 100644 (file)
--- a/src/cargo/core/source/mod.rs
+++ b/src/cargo/core/source/mod.rs
@@ -64,11 +64,6 @@ pub trait Source {
 }
 
 impl<'a, T: Source + ?Sized + 'a> Source for Box<T> {
-    /// Forwards to `Source::source_id`
-    fn source_id(&self) -> &SourceId {
-        (**self).source_id()
-    }
-
     /// Forwards to `Source::supports_checksums`
     fn supports_checksums(&self) -> bool {
         (**self).supports_checksums()
@@ -84,6 +79,11 @@ impl<'a, T: Source + ?Sized + 'a> Source for Box<T> {
         (**self).query(dep, f)
     }
 
+    /// Forwards to `Source::source_id`
+    fn source_id(&self) -> &SourceId {
+        (**self).source_id()
+    }
+
     /// Forwards to `Source::update`
     fn update(&mut self) -> CargoResult<()> {
         (**self).update()

diff --git a/src/cargo/sources/directory.rs b/src/cargo/sources/directory.rs
index 647c8b475de720aa00fca8da33576c1b09f5c179..bf20a270d2e7def80de2dd90974a5ba59bd9b8f4 100644 (file)
--- a/src/cargo/sources/directory.rs
+++ b/src/cargo/sources/directory.rs
@@ -45,8 +45,13 @@ impl<'cfg> Debug for DirectorySource<'cfg> {
 }
 
 impl<'cfg> Source for DirectorySource<'cfg> {
-    fn source_id(&self) -> &SourceId {
-        &self.source_id
+    fn query(&mut self, dep: &Dependency, f: &mut FnMut(Summary)) -> CargoResult<()> {
+        let packages = self.packages.values().map(|p| &p.0);
+        let matches = packages.filter(|pkg| dep.matches(pkg.summary()));
+        for summary in matches.map(|pkg| pkg.summary().clone()) {
+            f(summary);
+        }
+        Ok(())
     }
 
     fn supports_checksums(&self) -> bool {
@@ -57,13 +62,8 @@ impl<'cfg> Source for DirectorySource<'cfg> {
         true
     }
 
-    fn query(&mut self, dep: &Dependency, f: &mut FnMut(Summary)) -> CargoResult<()> {
-        let packages = self.packages.values().map(|p| &p.0);
-        let matches = packages.filter(|pkg| dep.matches(pkg.summary()));
-        for summary in matches.map(|pkg| pkg.summary().clone()) {
-            f(summary);
-        }
-        Ok(())
+    fn source_id(&self) -> &SourceId {
+        &self.source_id
     }
 
     fn update(&mut self) -> CargoResult<()> {

diff --git a/src/cargo/sources/git/source.rs b/src/cargo/sources/git/source.rs
index dfdf58996fca964de9ec9366fad9f95dec6543ae..f940eb4a78c78d5b99a1000586a3ee7d9fc9d67d 100644 (file)
--- a/src/cargo/sources/git/source.rs
+++ b/src/cargo/sources/git/source.rs
@@ -125,8 +125,11 @@ impl<'cfg> Debug for GitSource<'cfg> {
 }
 
 impl<'cfg> Source for GitSource<'cfg> {
-    fn source_id(&self) -> &SourceId {
-        &self.source_id
+    fn query(&mut self, dep: &Dependency, f: &mut FnMut(Summary)) -> CargoResult<()> {
+        let src = self.path_source
+            .as_mut()
+            .expect("BUG: update() must be called before query()");
+        src.query(dep, f)
     }
 
     fn supports_checksums(&self) -> bool {
@@ -137,11 +140,8 @@ impl<'cfg> Source for GitSource<'cfg> {
         true
     }
 
-    fn query(&mut self, dep: &Dependency, f: &mut FnMut(Summary)) -> CargoResult<()> {
-        let src = self.path_source
-            .as_mut()
-            .expect("BUG: update() must be called before query()");
-        src.query(dep, f)
+    fn source_id(&self) -> &SourceId {
+        &self.source_id
     }
 
     fn update(&mut self) -> CargoResult<()> {

diff --git a/src/cargo/sources/path.rs b/src/cargo/sources/path.rs
index e30b8103e3bd9048c35e134470ea2bce3b792eaf..c7a0fdf75c4e83e75c26f7758b583185a632faed 100644 (file)
--- a/src/cargo/sources/path.rs
+++ b/src/cargo/sources/path.rs
@@ -476,8 +476,13 @@ impl<'cfg> Debug for PathSource<'cfg> {
 }
 
 impl<'cfg> Source for PathSource<'cfg> {
-    fn source_id(&self) -> &SourceId {
-        &self.source_id
+    fn query(&mut self, dep: &Dependency, f: &mut FnMut(Summary)) -> CargoResult<()> {
+        for s in self.packages.iter().map(|p| p.summary()) {
+            if dep.matches(s) {
+                f(s.clone())
+            }
+        }
+        Ok(())
     }
 
     fn supports_checksums(&self) -> bool {
@@ -488,13 +493,8 @@ impl<'cfg> Source for PathSource<'cfg> {
         false
     }
 
-    fn query(&mut self, dep: &Dependency, f: &mut FnMut(Summary)) -> CargoResult<()> {
-        for s in self.packages.iter().map(|p| p.summary()) {
-            if dep.matches(s) {
-                f(s.clone())
-            }
-        }
-        Ok(())
+    fn source_id(&self) -> &SourceId {
+        &self.source_id
     }
 
     fn update(&mut self) -> CargoResult<()> {

diff --git a/src/cargo/sources/registry/mod.rs b/src/cargo/sources/registry/mod.rs
index d9571c23deee572948297e093faac80f2e0f24dd..2e6f63228b9a94290429a7b936ff13c282c2ebae 100644 (file)
--- a/src/cargo/sources/registry/mod.rs
+++ b/src/cargo/sources/registry/mod.rs
@@ -421,18 +421,6 @@ impl<'cfg> RegistrySource<'cfg> {
 }
 
 impl<'cfg> Source for RegistrySource<'cfg> {
-    fn source_id(&self) -> &SourceId {
-        &self.source_id
-    }
-
-    fn supports_checksums(&self) -> bool {
-        true
-    }
-
-    fn requires_precise(&self) -> bool {
-        false
-    }
-
     fn query(&mut self, dep: &Dependency, f: &mut FnMut(Summary)) -> CargoResult<()> {
         // If this is a precise dependency, then it came from a lockfile and in
         // theory the registry is known to contain this version. If, however, we
@@ -454,6 +442,18 @@ impl<'cfg> Source for RegistrySource<'cfg> {
         self.index.query(dep, &mut *self.ops, f)
     }
 
+    fn supports_checksums(&self) -> bool {
+        true
+    }
+
+    fn requires_precise(&self) -> bool {
+        false
+    }
+
+    fn source_id(&self) -> &SourceId {
+        &self.source_id
+    }
+
     fn update(&mut self) -> CargoResult<()> {
         // If we have an imprecise version then we don't know what we're going
         // to look for, so we always attempt to perform an update here.

diff --git a/src/cargo/sources/replaced.rs b/src/cargo/sources/replaced.rs
index 9d2ea2c41e06f9b7dde894b4d48a0f82503ed422..16d867c17bdedbfdd7b053e944d31616ebe56deb 100644 (file)
--- a/src/cargo/sources/replaced.rs
+++ b/src/cargo/sources/replaced.rs
@@ -22,18 +22,6 @@ impl<'cfg> ReplacedSource<'cfg> {
 }
 
 impl<'cfg> Source for ReplacedSource<'cfg> {
-    fn source_id(&self) -> &SourceId {
-        &self.to_replace
-    }
-
-    fn supports_checksums(&self) -> bool {
-        self.inner.supports_checksums()
-    }
-
-    fn requires_precise(&self) -> bool {
-        self.inner.requires_precise()
-    }
-
     fn query(&mut self, dep: &Dependency, f: &mut FnMut(Summary)) -> CargoResult<()> {
         let (replace_with, to_replace) = (&self.replace_with, &self.to_replace);
         let dep = dep.clone().map_source(to_replace, replace_with);
@@ -47,6 +35,18 @@ impl<'cfg> Source for ReplacedSource<'cfg> {
         Ok(())
     }
 
+    fn supports_checksums(&self) -> bool {
+        self.inner.supports_checksums()
+    }
+
+    fn requires_precise(&self) -> bool {
+        self.inner.requires_precise()
+    }
+
+    fn source_id(&self) -> &SourceId {
+        &self.to_replace
+    }
+
     fn update(&mut self) -> CargoResult<()> {
         self.inner
             .update()