From: Sascha Grunert <mail@saschagrunert.de>
Date: Sat, 12 Nov 2016 09:33:59 +0000 (+0100)
Subject: Fixed too long lines
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~13^2~2^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ed61ba20b684a9308a74cbfcd36dcce89c3da31d;p=cargo.git

Fixed too long lines
---

diff --git a/src/cargo/sources/path.rs b/src/cargo/sources/path.rs
index e5a7ae6f8..18e6e35da 100644
--- a/src/cargo/sources/path.rs
+++ b/src/cargo/sources/path.rs
@@ -94,8 +94,18 @@ impl<'cfg> PathSource<'cfg> {
                 human(format!("could not parse pattern `{}`: {}", p, e))
             })
         };
-        let exclude = pkg.manifest().exclude().iter().map(|p| parse(p)).collect::<Result<Vec<_>, _>>()?;
-        let include = pkg.manifest().include().iter().map(|p| parse(p)).collect::<Result<Vec<_>, _>>()?;
+
+        let exclude = pkg.manifest()
+                         .exclude()
+                         .iter()
+                         .map(|p| parse(p))
+                         .collect::<Result<Vec<_>, _>>()?;
+
+        let include = pkg.manifest()
+                         .include()
+                         .iter()
+                         .map(|p| parse(p))
+                         .collect::<Result<Vec<_>, _>>()?;
 
         let mut filter = |p: &Path| {
             let relative_path = util::without_prefix(p, &root).unwrap();
diff --git a/src/cargo/util/toml.rs b/src/cargo/util/toml.rs
index ca61e3a54..c5d70b709 100644
--- a/src/cargo/util/toml.rs
+++ b/src/cargo/util/toml.rs
@@ -597,15 +597,21 @@ impl TomlManifest {
             }
 
             // Collect the deps
-            process_dependencies(&mut cx, self.dependencies.as_ref(), None)?;
-            process_dependencies(&mut cx, self.dev_dependencies.as_ref(), Some(Kind::Development))?;
-            process_dependencies(&mut cx, self.build_dependencies.as_ref(), Some(Kind::Build))?;
+            process_dependencies(&mut cx, self.dependencies.as_ref(),
+                                 None)?;
+            process_dependencies(&mut cx, self.dev_dependencies.as_ref(),
+                                 Some(Kind::Development))?;
+            process_dependencies(&mut cx, self.build_dependencies.as_ref(),
+                                 Some(Kind::Build))?;
 
             for (name, platform) in self.target.iter().flat_map(|t| t) {
                 cx.platform = Some(name.parse()?);
-                process_dependencies(&mut cx, platform.dependencies.as_ref(), None)?;
-                process_dependencies(&mut cx, platform.build_dependencies.as_ref(), Some(Kind::Build))?;
-                process_dependencies(&mut cx, platform.dev_dependencies.as_ref(), Some(Kind::Development))?;
+                process_dependencies(&mut cx, platform.dependencies.as_ref(),
+                                     None)?;
+                process_dependencies(&mut cx, platform.build_dependencies.as_ref(),
+                                     Some(Kind::Build))?;
+                process_dependencies(&mut cx, platform.dev_dependencies.as_ref(),
+                                     Some(Kind::Development))?;
             }
 
             replace = self.replace(&mut cx)?;