diff options
Diffstat (limited to 'src/libstd/path')
| -rw-r--r-- | src/libstd/path/posix.rs | 20 | ||||
| -rw-r--r-- | src/libstd/path/windows.rs | 21 |
2 files changed, 22 insertions, 19 deletions
diff --git a/src/libstd/path/posix.rs b/src/libstd/path/posix.rs index 512b20ebf4c..3596a07eeb2 100644 --- a/src/libstd/path/posix.rs +++ b/src/libstd/path/posix.rs @@ -1179,13 +1179,13 @@ mod tests { (s: $path:expr, $exp:expr) => ( { let path = Path::new($path); - let comps = path.components().to_owned_vec(); + let comps = path.components().collect::<~[&[u8]]>(); let exp: &[&str] = $exp; - let exps = exp.iter().map(|x| x.as_bytes()).to_owned_vec(); + let exps = exp.iter().map(|x| x.as_bytes()).collect::<~[&[u8]]>(); assert!(comps == exps, "components: Expected {:?}, found {:?}", comps, exps); - let comps = path.rev_components().to_owned_vec(); - let exps = exps.move_rev_iter().to_owned_vec(); + let comps = path.rev_components().collect::<~[&[u8]]>(); + let exps = exps.move_rev_iter().collect::<~[&[u8]]>(); assert!(comps == exps, "rev_components: Expected {:?}, found {:?}", comps, exps); } @@ -1193,12 +1193,12 @@ mod tests { (v: [$($arg:expr),+], [$([$($exp:expr),*]),*]) => ( { let path = Path::new(b!($($arg),+)); - let comps = path.components().to_owned_vec(); + let comps = path.components().collect::<~[&[u8]]>(); let exp: &[&[u8]] = [$(b!($($exp),*)),*]; assert!(comps.as_slice() == exp, "components: Expected {:?}, found {:?}", comps.as_slice(), exp); - let comps = path.rev_components().to_owned_vec(); - let exp = exp.rev_iter().map(|&x|x).to_owned_vec(); + let comps = path.rev_components().collect::<~[&[u8]]>(); + let exp = exp.rev_iter().map(|&x|x).collect::<~[&[u8]]>(); assert!(comps.as_slice() == exp, "rev_components: Expected {:?}, found {:?}", comps.as_slice(), exp); @@ -1228,13 +1228,13 @@ mod tests { (v: [$($arg:expr),+], $exp:expr) => ( { let path = Path::new(b!($($arg),+)); - let comps = path.str_components().to_owned_vec(); + let comps = path.str_components().collect::<~[Option<&str>]>(); let exp: &[Option<&str>] = $exp; assert!(comps.as_slice() == exp, "str_components: Expected {:?}, found {:?}", comps.as_slice(), exp); - let comps = path.rev_str_components().to_owned_vec(); - let exp = exp.rev_iter().map(|&x|x).to_owned_vec(); + let comps = path.rev_str_components().collect::<~[Option<&str>]>(); + let exp = exp.rev_iter().map(|&x|x).collect::<~[Option<&str>]>(); assert!(comps.as_slice() == exp, "rev_str_components: Expected {:?}, found {:?}", comps.as_slice(), exp); diff --git a/src/libstd/path/windows.rs b/src/libstd/path/windows.rs index 81da2f50f8d..9d65a99a0b5 100644 --- a/src/libstd/path/windows.rs +++ b/src/libstd/path/windows.rs @@ -2226,13 +2226,15 @@ mod tests { (s: $path:expr, $exp:expr) => ( { let path = Path::new($path); - let comps = path.str_components().map(|x|x.unwrap()).to_owned_vec(); + let comps = path.str_components().map(|x|x.unwrap()) + .collect::<~[&str]>(); let exp: &[&str] = $exp; assert!(comps.as_slice() == exp, "str_components: Expected {:?}, found {:?}", comps.as_slice(), exp); - let comps = path.rev_str_components().map(|x|x.unwrap()).to_owned_vec(); - let exp = exp.rev_iter().map(|&x|x).to_owned_vec(); + let comps = path.rev_str_components().map(|x|x.unwrap()) + .collect::<~[&str]>(); + let exp = exp.rev_iter().map(|&x|x).collect::<~[&str]>(); assert!(comps.as_slice() == exp, "rev_str_components: Expected {:?}, found {:?}", comps.as_slice(), exp); @@ -2241,13 +2243,14 @@ mod tests { (v: [$($arg:expr),+], $exp:expr) => ( { let path = Path::new(b!($($arg),+)); - let comps = path.str_components().map(|x|x.unwrap()).to_owned_vec(); + let comps = path.str_components().map(|x|x.unwrap()).collect::<~[&str]>(); let exp: &[&str] = $exp; assert!(comps.as_slice() == exp, "str_components: Expected {:?}, found {:?}", comps.as_slice(), exp); - let comps = path.rev_str_components().map(|x|x.unwrap()).to_owned_vec(); - let exp = exp.rev_iter().map(|&x|x).to_owned_vec(); + let comps = path.rev_str_components().map(|x|x.unwrap()) + .collect::<~[&str]>(); + let exp = exp.rev_iter().map(|&x|x).collect::<~[&str]>(); assert!(comps.as_slice() == exp, "rev_str_components: Expected {:?}, found {:?}", comps.as_slice(), exp); @@ -2301,12 +2304,12 @@ mod tests { (s: $path:expr, $exp:expr) => ( { let path = Path::new($path); - let comps = path.components().to_owned_vec(); + let comps = path.components().collect::<~[&[u8]]>(); let exp: &[&[u8]] = $exp; assert!(comps.as_slice() == exp, "components: Expected {:?}, found {:?}", comps.as_slice(), exp); - let comps = path.rev_components().to_owned_vec(); - let exp = exp.rev_iter().map(|&x|x).to_owned_vec(); + let comps = path.rev_components().collect::<~[&[u8]]>(); + let exp = exp.rev_iter().map(|&x|x).collect::<~[&[u8]]>(); assert!(comps.as_slice() == exp, "rev_components: Expected {:?}, found {:?}", comps.as_slice(), exp); |