diff options
| author | Brian Anderson <banderson@mozilla.com> | 2014-08-13 16:33:14 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2014-08-13 17:11:21 -0700 |
| commit | fce442e75c5b3df8eea401fae1200314f0d47c40 (patch) | |
| tree | 60d76c2f2a57929a6fb8ab311318c77f176a4604 | |
| parent | c3b9d5df6250ef021acf993576d52dd7a29a6bba (diff) | |
| download | rust-fce442e75c5b3df8eea401fae1200314f0d47c40.tar.gz rust-fce442e75c5b3df8eea401fae1200314f0d47c40.zip | |
Fix test fallout
| -rw-r--r-- | src/libcollections/hash/sip.rs | 2 | ||||
| -rw-r--r-- | src/libcollections/str.rs | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/libcollections/hash/sip.rs b/src/libcollections/hash/sip.rs index 12888de43a0..b31d811c2c9 100644 --- a/src/libcollections/hash/sip.rs +++ b/src/libcollections/hash/sip.rs @@ -275,7 +275,7 @@ mod tests { use str::Str; use string::String; - use slice::{Vector, ImmutableSlice}; + use slice::{Slice, ImmutableSlice}; use vec::Vec; use super::super::{Hash, Writer}; diff --git a/src/libcollections/str.rs b/src/libcollections/str.rs index 35ecfbd5792..60ee8cc04f7 100644 --- a/src/libcollections/str.rs +++ b/src/libcollections/str.rs @@ -894,7 +894,7 @@ mod tests { use {Collection, MutableSeq}; use super::*; - use std::slice::{Vector, ImmutableSlice}; + use std::slice::{Slice, ImmutableSlice}; use string::String; use vec::Vec; @@ -1812,17 +1812,17 @@ mod tests { fn test_splitn_char_iterator() { let data = "\nMäry häd ä little lämb\nLittle lämb\n"; - let split: Vec<&str> = data.splitn(' ', 3).collect(); + let split: Vec<&str> = data.splitn(3, ' ').collect(); assert_eq!(split, vec!["\nMäry", "häd", "ä", "little lämb\nLittle lämb\n"]); - let split: Vec<&str> = data.splitn(|c: char| c == ' ', 3).collect(); + let split: Vec<&str> = data.splitn(3, |c: char| c == ' ').collect(); assert_eq!(split, vec!["\nMäry", "häd", "ä", "little lämb\nLittle lämb\n"]); // Unicode - let split: Vec<&str> = data.splitn('ä', 3).collect(); + let split: Vec<&str> = data.splitn(3, 'ä').collect(); assert_eq!(split, vec!["\nM", "ry h", "d ", " little lämb\nLittle lämb\n"]); - let split: Vec<&str> = data.splitn(|c: char| c == 'ä', 3).collect(); + let split: Vec<&str> = data.splitn(3, |c: char| c == 'ä').collect(); assert_eq!(split, vec!["\nM", "ry h", "d ", " little lämb\nLittle lämb\n"]); } @@ -1830,20 +1830,20 @@ mod tests { fn test_rsplitn_char_iterator() { let data = "\nMäry häd ä little lämb\nLittle lämb\n"; - let mut split: Vec<&str> = data.rsplitn(' ', 3).collect(); + let mut split: Vec<&str> = data.rsplitn(3, ' ').collect(); split.reverse(); assert_eq!(split, vec!["\nMäry häd ä", "little", "lämb\nLittle", "lämb\n"]); - let mut split: Vec<&str> = data.rsplitn(|c: char| c == ' ', 3).collect(); + let mut split: Vec<&str> = data.rsplitn(3, |c: char| c == ' ').collect(); split.reverse(); assert_eq!(split, vec!["\nMäry häd ä", "little", "lämb\nLittle", "lämb\n"]); // Unicode - let mut split: Vec<&str> = data.rsplitn('ä', 3).collect(); + let mut split: Vec<&str> = data.rsplitn(3, 'ä').collect(); split.reverse(); assert_eq!(split, vec!["\nMäry häd ", " little l", "mb\nLittle l", "mb\n"]); - let mut split: Vec<&str> = data.rsplitn(|c: char| c == 'ä', 3).collect(); + let mut split: Vec<&str> = data.rsplitn(3, |c: char| c == 'ä').collect(); split.reverse(); assert_eq!(split, vec!["\nMäry häd ", " little l", "mb\nLittle l", "mb\n"]); } |
