diff options
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/env.rs | 6 | ||||
| -rw-r--r-- | src/libstd/fs/mod.rs | 6 | ||||
| -rw-r--r-- | src/libstd/process.rs | 14 | ||||
| -rw-r--r-- | src/libstd/thread.rs | 2 |
4 files changed, 14 insertions, 14 deletions
diff --git a/src/libstd/env.rs b/src/libstd/env.rs index c052a69bc34..b2ef04a5d63 100644 --- a/src/libstd/env.rs +++ b/src/libstd/env.rs @@ -780,8 +780,8 @@ mod tests { i += 1; } let n = make_rand_name(); - set_var(&n, s.as_slice()); - eq(var_os(&n), Some(s.as_slice())); + set_var(&n, &s); + eq(var_os(&n), Some(&s)); } #[test] @@ -799,7 +799,7 @@ mod tests { let n = make_rand_name(); let s = repeat("x").take(10000).collect::<String>(); set_var(&n, &s); - eq(var_os(&n), Some(s.as_slice())); + eq(var_os(&n), Some(&s)); remove_var(&n); eq(var_os(&n), None); } diff --git a/src/libstd/fs/mod.rs b/src/libstd/fs/mod.rs index 80ec9909824..9f9163eb9e6 100644 --- a/src/libstd/fs/mod.rs +++ b/src/libstd/fs/mod.rs @@ -828,7 +828,7 @@ mod tests { macro_rules! error { ($e:expr, $s:expr) => ( match $e { Ok(_) => panic!("Unexpected success. Should've been: {:?}", $s), - Err(ref err) => assert!(err.to_string().contains($s.as_slice()), + Err(ref err) => assert!(err.to_string().contains($s), format!("`{}` did not contain `{}`", err, $s)) } ) } @@ -880,7 +880,7 @@ mod tests { -1|0 => panic!("shouldn't happen"), n => str::from_utf8(&read_buf[..n]).unwrap().to_string() }; - assert_eq!(read_str.as_slice(), message); + assert_eq!(read_str, message); } check!(fs::remove_file(filename)); } @@ -1107,7 +1107,7 @@ mod tests { check!(check!(File::open(&f)).read(&mut mem)); let read_str = str::from_utf8(&mem).unwrap(); let expected = format!("{}{}", prefix, n.to_str().unwrap()); - assert_eq!(expected.as_slice(), read_str); + assert_eq!(expected, read_str); } check!(fs::remove_file(&f)); } 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))); } } } diff --git a/src/libstd/thread.rs b/src/libstd/thread.rs index 0ce3ca1f97a..7d0df679591 100644 --- a/src/libstd/thread.rs +++ b/src/libstd/thread.rs @@ -284,7 +284,7 @@ impl Builder { stack::record_os_managed_stack_bounds(my_stack_bottom, my_stack_top); } match their_thread.name() { - Some(name) => unsafe { imp::set_name(name.as_slice()); }, + Some(name) => unsafe { imp::set_name(name); }, None => {} } thread_info::set( |