From ae429056ffa166a9d3a15c8641a838a7a2f5f86e Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Sat, 22 Mar 2014 19:18:37 -0400 Subject: iter: remove `to_owned_vec` This needs to be removed as part of removing `~[T]`. Partial type hints are now allowed, and will remove the need to add a version of this method for `Vec`. For now, this involves a few workarounds for partial type hints not completely working. --- src/libstd/path/posix.rs | 20 ++++++++++---------- src/libstd/path/windows.rs | 21 ++++++++++++--------- 2 files changed, 22 insertions(+), 19 deletions(-) (limited to 'src/libstd/path') diff --git a/src/libstd/path/posix.rs b/src/libstd/path/posix.rs index f654f59266a..fd9423ad3e7 100644 --- a/src/libstd/path/posix.rs +++ b/src/libstd/path/posix.rs @@ -1177,13 +1177,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); } @@ -1191,12 +1191,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); @@ -1226,13 +1226,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 dba8af4128b..2a77f63acc2 100644 --- a/src/libstd/path/windows.rs +++ b/src/libstd/path/windows.rs @@ -2224,13 +2224,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); @@ -2239,13 +2241,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); @@ -2299,12 +2302,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); -- cgit 1.4.1-3-g733a5