switch to OsString

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

Author: Freyskeyd

README.md

@@ -1,5 +1,4 @@
 # Assert CLI
- 
 > **Test CLI Applications** - This crate checks the output of a child process is as expected.
 
 [![Build Status](https://travis-ci.org/killercup/assert_cli.svg)](https://travis-ci.org/killercup/assert_cli) [![Documentation](https://img.shields.io/badge/docs-master-blue.svg)][Documentation]

src/assert.rs

@@ -144,6 +144,15 @@ impl Assert {
     ///     .stdout().contains("TEST_ENV=OK")
     ///     .execute()
     ///     .unwrap();
+    ///
+    /// let env = assert_cli::Environment::empty()
+    ///     .insert("FOO", "BAR");
+    ///
+    /// assert_cli::Assert::command(&["printenv"])
+    ///     .with_env(&env)
+    ///     .stdout().is("FOO=BAR")
+    ///     .execute()
+    ///     .unwrap();
     /// ```
     pub fn with_env<E: Into<Environment>>(mut self, env: E) -> Self {
         self.env = env.into();

src/environment.rs

@@ -1,8 +1,9 @@
+use std::ffi::OsString;
 /// Structure to deal with environment variables
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct Environment {
     /// Customized environment variables
-    vars: Vec<(String, String)>,
+    vars: Vec<(OsString, OsString)>,
     /// Define if the structure must inherit
     inherit: bool,
 }
@@ -17,15 +18,17 @@ impl Default for Environment {
 }
 
 impl Environment {
-    /// Create a new Environment object with inherit
+    /// Create a new Environment that inherits this process' environment.
     ///
     /// # Examples
     ///
     /// ```rust
     /// extern crate assert_cli;
     ///
+    /// use std::ffi::OsString;
+    ///
     /// let e = assert_cli::Environment::inherit().compile();
-    /// let e_: Vec<(String, String)> = ::std::env::vars().collect();
+    /// let e_: Vec<(OsString, OsString)> = ::std::env::vars_os().collect();
     ///
     /// assert_eq!(e, e_);
     /// ```
@@ -36,7 +39,7 @@ impl Environment {
         }
     }
 
-    /// Create a new Environment object without inheriting
+    /// Create a new Environment independent of the current process's Environment
     ///
     /// # Examples
     ///
@@ -57,18 +60,20 @@ impl Environment {
     /// ```rust
     /// extern crate assert_cli;
     ///
+    /// use std::ffi::OsString;
+    ///
     /// let e = assert_cli::Environment::empty().insert("foo", "bar").compile();
-    /// assert_eq!(e, vec![("foo".to_string(), "bar".to_string())]);
+    /// assert_eq!(e, vec![(OsString::from("foo"), OsString::from("bar"))]);
     /// ```
-    pub fn insert<S1: Into<String>, S2: Into<String>>(mut self, key: S1, val: S2) -> Self {
+    pub fn insert<S1: Into<OsString>, S2: Into<OsString>>(mut self, key: S1, val: S2) -> Self {
         self.vars.push((key.into(), val.into()));
         self
     }
 
     /// Compile Environment object
-    pub fn compile(self) -> Vec<(String, String)> {
+    pub fn compile(self) -> Vec<(OsString, OsString)> {
         if self.inherit {
-            ::std::env::vars().chain(self.vars).collect()
+            ::std::env::vars_os().chain(self.vars).collect()
         } else {
             self.vars
         }
@@ -83,12 +88,15 @@ impl<'a> From<&'a Environment> for Environment {
 }
 
 pub trait EnvironmentItem {
-    fn to_environment_tuple(&self) -> (String, String);
+    fn to_environment_tuple(&self) -> (OsString, OsString);
 }
 
 impl<'s, T: ToString, Z: ToString> EnvironmentItem for &'s (T, Z) {
-    fn to_environment_tuple(&self) -> (String, String) {
-        (self.0.to_string(), self.1.to_string())
+    fn to_environment_tuple(&self) -> (OsString, OsString) {
+        (
+            OsString::from(self.0.to_string()),
+            OsString::from(self.1.to_string()),
+        )
     }
 }
 
@@ -128,7 +136,10 @@ mod test {
 
         let y = y.insert("key", "value");
 
-        assert_eq!(y.compile(), vec![("key".to_string(), "value".to_string())]);
+        assert_eq!(
+            y.compile(),
+            vec![(OsString::from("key"), OsString::from("value"))]
+        );
     }
 
     #[test]
@@ -154,7 +165,7 @@ mod test {
 
         assert_eq!(
             y.clone().insert("key", "value").compile(),
-            vec![("key".to_string(), "value".to_string())]
+            vec![(OsString::from("key"), OsString::from("value"))]
         );
 
         assert!(