about summary refs log tree commit diff
path: root/src/libstd/process.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-03-09 21:02:50 +0000
committerbors <bors@rust-lang.org>2015-03-09 21:02:50 +0000
commitb83b26bacb6371173cdec6bf68c7ffa69f858c84 (patch)
tree5657bd41b93f00786469b3fade19ff617c14c673 /src/libstd/process.rs
parent638832e64cc62ec46721161ca19731ba00d4da58 (diff)
parent7981aa6ac9165b0bb1a5f624b8802192b8ebc9ee (diff)
Auto merge of #22561 - richo:as_slice-as_str, r=Manishearth
This may not be quite ready to go out, I fixed some docs but suspect I missed a bunch.

I also wound up fixing a bunch of redundant `[]` suffixes, but on closer inspection I don't believe that can land until after a snapshot.
Diffstat (limited to 'src/libstd/process.rs')
-rw-r--r--src/libstd/process.rs14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/libstd/process.rs b/src/libstd/process.rs
index d4392a0740a..ec4fcec5556 100644
--- a/src/libstd/process.rs
+++ b/src/libstd/process.rs
@@ -812,7 +812,7 @@ mod tests {
         for (ref k, ref v) in env::vars() {
             // don't check windows magical empty-named variables
             assert!(k.is_empty() ||
-                    output.contains(format!("{}={}", *k, *v).as_slice()),
+                    output.contains(&format!("{}={}", *k, *v)),
                     "output doesn't contain `{}={}`\n{}",
                     k, v, output);
         }
@@ -830,12 +830,12 @@ mod tests {
         for &(ref k, ref v) in &r {
             // don't check android RANDOM variables
             if *k != "RANDOM".to_string() {
-                assert!(output.contains(format!("{}={}",
-                                                *k,
-                                                *v).as_slice()) ||
-                        output.contains(format!("{}=\'{}\'",
-                                                *k,
-                                                *v).as_slice()));
+                assert!(output.contains(&format!("{}={}",
+                                                 *k,
+                                                 *v)) ||
+                        output.contains(&format!("{}=\'{}\'",
+                                                 *k,
+                                                 *v)));
             }
         }
     }