fix typo

Signed-off-by: Freyskeyd <[email protected]>

Author: Freyskeyd

.travis.yml

@@ -11,14 +11,14 @@ matrix:
     env: CLIPPY_VERS="0.0.165"
     before_script: |
       [[ "$(cargo +nightly-2017-10-09 clippy --version)" != "$CLIPPY_VERS" ]] && \
-      cargo +nightly-2017-10-09 install clippy --vers "$CLIPPY_VERS" --force
+      cargo +nightly-2017-10-09 install clippy --vers "$CLIPPY_VERS" --force || true
     script: |
       cargo +nightly-2017-10-09 clippy -- -D warnings
   - rust: nightly-2017-10-09
     env: RUSTFMT_VERS="0.2.8"
     before_script: |
       [[ "$(cargo +nightly-2017-10-09 fmt -- --version)" != "$RUSTFMT_VERS"* ]] && \
-      cargo +nightly-2017-10-09 install rustfmt-nightly --vers "$RUSTFMT_VERS" --force
+      cargo +nightly-2017-10-09 install rustfmt-nightly --vers "$RUSTFMT_VERS" --force || true
     script: |
       cargo +nightly-2017-10-09 fmt --all -- --write-mode=diff
 before_script:

src/environment.rs

@@ -93,13 +93,13 @@ impl<'s, T: ToString, Z: ToString> EnvironmentItem for &'s (T, Z) {
 }
 
 impl<'s, T> From<T> for Environment
-    where T: IntoIterator, T::Item: EnvironmentItem
+where
+    T: IntoIterator,
+    T::Item: EnvironmentItem
 {
     fn from(v: T) -> Self {
         Self {
-            vars: v.into_iter()
-                .map(|k| k.to_environment_tuple())
-                .collect(),
+            vars: v.into_iter().map(|k| k.to_environment_tuple()).collect(),
             inherit: false,
         }
     }
@@ -109,7 +109,7 @@ impl<'s, T> From<T> for Environment
 #[cfg(test)]
 mod test {
     use super::*;
-    use ::Assert;
+    use Assert;
 
     fn command() -> Assert {
         Assert::command(&["printenv"])
@@ -119,10 +119,7 @@ mod test {
     fn take_ownership() {
         let x = Environment::inherit();
 
-        command()
-            .with_env(x.clone())
-            .with_env(&x)
-            .with_env(x);
+        command().with_env(x.clone()).with_env(&x).with_env(x);
     }
 
     #[test]
@@ -138,11 +135,14 @@ mod test {
     fn in_place_mod2() {
         let x = Environment::inherit();
 
-        assert!(command()
-            .with_env(&x.insert("key", "value").insert("key", "vv"))
-            .stdout().contains("key=vv")
-            .execute()
-            .is_ok());
+        assert!(
+            command()
+                .with_env(&x.insert("key", "value").insert("key", "vv"))
+                .stdout()
+                .contains("key=vv")
+                .execute()
+                .is_ok()
+        );
         // Granted, `insert` moved `x`, so we can no longer reference it, even
         // though only a reference was passed to `with_env`
     }
@@ -152,55 +152,144 @@ mod test {
         // In-place modification while allowing later accesses to the `Environment`
         let y = Environment::empty();
 
-        assert_eq!(y.clone().insert("key", "value").compile(), vec![("key".to_string(), "value".to_string())]);
-        assert!(command()
-            .with_env(y)
-            .stdout().not().contains("key=value")
-            .execute().is_ok());
+        assert_eq!(
+            y.clone().insert("key", "value").compile(),
+            vec![("key".to_string(), "value".to_string())]
+        );
+
+        assert!(
+            command()
+                .with_env(y)
+                .stdout()
+                .not()
+                .contains("key=value")
+                .execute()
+                .is_ok()
+        );
     }
 
     #[test]
     fn empty_env() {
         // In-place modification while allowing later accesses to the `Environment`
         let y = Environment::empty();
 
-        assert!(command()
-            .with_env(y)
-            .stdout().is("")
-            .execute().is_ok());
+        assert!(command().with_env(y).stdout().is("").execute().is_ok());
     }
     #[test]
     fn take_vec() {
         let v = vec![("bar".to_string(), "baz".to_string())];
 
-        assert!(command().with_env(&vec![("bar", "baz")]).stdout().contains("bar=baz").execute().is_ok());
-        assert!(command().with_env(&v).stdout().contains("bar=baz").execute().is_ok());
-        assert!(command().with_env(&vec![("bar", "baz")]).stdout().isnt("").execute().is_ok());
+        assert!(
+            command()
+                .with_env(&vec![("bar", "baz")])
+                .stdout()
+                .contains("bar=baz")
+                .execute()
+                .is_ok()
+        );
+
+        assert!(
+            command()
+                .with_env(&v)
+                .stdout()
+                .contains("bar=baz")
+                .execute()
+                .is_ok()
+        );
+
+        assert!(
+            command()
+                .with_env(&vec![("bar", "baz")])
+                .stdout()
+                .isnt("")
+                .execute()
+                .is_ok()
+        );
     }
 
     #[test]
     fn take_slice_of_strs() {
-        assert!(command().with_env(&[("bar", "BAZ")]).stdout().contains("bar=BAZ").execute().is_ok());
-        assert!(command().with_env(&[("bar", "BAZ")][..]).stdout().contains("bar=BAZ").execute().is_ok());
-        assert!(command().with_env([("bar", "BAZ")].as_ref()).stdout().contains("bar=BAZ").execute().is_ok());
+        assert!(
+            command()
+                .with_env(&[("bar", "BAZ")])
+                .stdout()
+                .contains("bar=BAZ")
+                .execute()
+                .is_ok()
+        );
+
+        assert!(
+            command()
+                .with_env(&[("bar", "BAZ")][..])
+                .stdout()
+                .contains("bar=BAZ")
+                .execute()
+                .is_ok()
+        );
+
+        assert!(
+            command()
+                .with_env([("bar", "BAZ")].as_ref())
+                .stdout()
+                .contains("bar=BAZ")
+                .execute()
+                .is_ok()
+        );
     }
 
     #[test]
     fn take_slice_of_strings() {
         // same deal as above
 
-        assert!(command().with_env(&[("bar".to_string(), "BAZ".to_string())]).stdout().contains("bar=BAZ").execute().is_ok());
-        assert!(command().with_env(&[("bar".to_string(), "BAZ".to_string())][..]).stdout().contains("bar=BAZ").execute().is_ok());
+        assert!(
+            command()
+                .with_env(&[("bar".to_string(), "BAZ".to_string())])
+                .stdout()
+                .contains("bar=BAZ")
+                .execute()
+                .is_ok()
+        );
+
+        assert!(
+            command()
+                .with_env(&[("bar".to_string(), "BAZ".to_string())][..])
+                .stdout()
+                .contains("bar=BAZ")
+                .execute()
+                .is_ok()
+        );
     }
 
     #[test]
     fn take_slice() {
-        assert!(command().with_env(&[("hey", "ho")]).stdout().contains("hey=ho").execute().is_ok());
-        assert!(command().with_env(&[("hey", "ho".to_string())]).stdout().contains("hey=ho").execute().is_ok());
+        assert!(
+            command()
+                .with_env(&[("hey", "ho")])
+                .stdout()
+                .contains("hey=ho")
+                .execute()
+                .is_ok()
+        );
+
+        assert!(
+            command()
+                .with_env(&[("hey", "ho".to_string())])
+                .stdout()
+                .contains("hey=ho")
+                .execute()
+                .is_ok()
+        );
     }
 
     #[test]
     fn take_string_i32() {
-        assert!(command().with_env(&[("bar", 3 as i32)]).stdout().contains("bar=3").execute().is_ok());
+        assert!(
+            command()
+                .with_env(&[("bar", 3 as i32)])
+                .stdout()
+                .contains("bar=3")
+                .execute()
+                .is_ok()
+        );
     }
 }