From 0295809436d8e178a7d0528b47b9d4313b292eef Mon Sep 17 00:00:00 2001
From: Matthias Beyer <matthias.beyer@atos.net>
Date: Mon, 18 Jan 2021 14:48:59 +0100
Subject: Run `cargo fmt`

Signed-off-by: Matthias Beyer <matthias.beyer@atos.net>
---
 src/repository/repository.rs | 49 +++++++++++++++++++++++++-------------------
 1 file changed, 28 insertions(+), 21 deletions(-)

(limited to 'src/repository')

diff --git a/src/repository/repository.rs b/src/repository/repository.rs
index 7b090ae..b987347 100644
--- a/src/repository/repository.rs
+++ b/src/repository/repository.rs
@@ -34,14 +34,14 @@ impl From<BTreeMap<(PackageName, PackageVersion), Package>> for Repository {
 }
 
 impl Repository {
-
     pub fn load(path: &Path, progress: &indicatif::ProgressBar) -> Result<Self> {
         fn all_subdirs(p: &Path) -> Result<Vec<PathBuf>> {
             let mut v = Vec::new();
             for de in p.read_dir()? {
                 let de = de?;
                 let is_dir = de.file_type()?.is_dir();
-                let is_hidden = de.path()
+                let is_hidden = de
+                    .path()
                     .file_name()
                     .and_then(|s| s.to_str())
                     .map(|s| s.starts_with('.'))
@@ -55,42 +55,46 @@ impl Repository {
             Ok(v)
         }
 
-        fn load_recursive(path: &Path, mut config: config::Config, progress: &indicatif::ProgressBar) -> Result<Vec<Result<Package>>> {
+        fn load_recursive(
+            path: &Path,
+            mut config: config::Config,
+            progress: &indicatif::ProgressBar,
+        ) -> Result<Vec<Result<Package>>> {
             let pkg_file = path.join("pkg.toml");
 
             if pkg_file.is_file() {
                 let buf = std::fs::read_to_string(&pkg_file)
                     .with_context(|| format!("Reading {}", pkg_file.display()))?;
 
-                config.merge(config::File::from_str(&buf, config::FileFormat::Toml))
+                config
+                    .merge(config::File::from_str(&buf, config::FileFormat::Toml))
                     .with_context(|| format!("Loading contents of {}", pkg_file.display()))?;
             }
 
-            let subdirs = all_subdirs(path).with_context(|| format!("Finding subdirs for {}", pkg_file.display()))?;
+            let subdirs = all_subdirs(path)
+                .with_context(|| format!("Finding subdirs for {}", pkg_file.display()))?;
 
             if subdirs.is_empty() {
                 progress.tick();
                 if pkg_file.is_file() {
-                    let package = config
-                        .try_into()
-                        .with_context(|| format!("Failed to parse {} into package", path.display()));
+                    let package = config.try_into().with_context(|| {
+                        format!("Failed to parse {} into package", path.display())
+                    });
 
                     Ok(vec![package])
                 } else {
                     Ok(vec![])
                 }
             } else {
-                subdirs
-                    .into_iter()
-                    .fold(Ok(Vec::new()), |vec, dir| {
-                        vec.and_then(|mut v| {
-                            let mut loaded = load_recursive(&dir, config.clone(), progress)
-                                .with_context(|| format!("Recursing for {}", pkg_file.display()))?;
-
-                            v.append(&mut loaded);
-                            Ok(v)
-                        })
+                subdirs.into_iter().fold(Ok(Vec::new()), |vec, dir| {
+                    vec.and_then(|mut v| {
+                        let mut loaded = load_recursive(&dir, config.clone(), progress)
+                            .with_context(|| format!("Recursing for {}", pkg_file.display()))?;
+
+                        v.append(&mut loaded);
+                        Ok(v)
                     })
+                })
             }
         }
 
@@ -119,7 +123,11 @@ impl Repository {
             .collect()
     }
 
-    pub fn find_with_version<'a>(&'a self, name: &PackageName, vc: &PackageVersionConstraint) -> Vec<&'a Package> {
+    pub fn find_with_version<'a>(
+        &'a self,
+        name: &PackageName,
+        vc: &PackageVersionConstraint,
+    ) -> Vec<&'a Package> {
         self.inner
             .iter()
             .filter(|((n, v), _)| n == name && vc.matches(v))
@@ -135,9 +143,9 @@ impl Repository {
 #[cfg(test)]
 pub mod tests {
     use super::*;
+    use crate::package::tests::package;
     use crate::package::tests::pname;
     use crate::package::tests::pversion;
-    use crate::package::tests::package;
 
     #[test]
     fn test_finding_by_name() {
@@ -189,7 +197,6 @@ pub mod tests {
         assert!(!p.version_is_semver());
     }
 
-
     #[test]
     fn test_find_with_vers_constr_exact() {
         let mut btree = BTreeMap::new();
-- 
cgit v1.2.3