bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

More test fixes

Browse source
This commit is contained in:
Alex Crichton 2015-01-06 16:16:35 -08:00
parent 24ccb34266
commit a64000820f
64 changed files with 227 additions and 187 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libstd/path/posix.rs
View file

@ -1150,7 +1150,7 @@ mod tests {
let comps = path.components().collect::<Vec<&[u8]>>();
let exp: &[&str] = &$exp;
let exps = exp.iter().map(|x| x.as_bytes()).collect::<Vec<&[u8]>>();
assert_eq!(comps, exprs);
assert_eq!(comps, exps);
let comps = path.components().rev().collect::<Vec<&[u8]>>();
let exps = exps.into_iter().rev().collect::<Vec<&[u8]>>();
assert_eq!(comps, exps);

11
src/libstd/path/windows.rs
View file

@ -1740,8 +1740,8 @@ mod tests {
let path = Path::new(pstr);
let arg = $arg;
let res = path.$op(arg);
let exp = $res;
assert_eq!(Path::new($path).$op($arg), $res);
let exp = Path::new($res);
assert_eq!(res, exp);
}
)
}
@ -1920,8 +1920,7 @@ mod tests {
{
let path = Path::new($path);
let (abs, vol, cwd, rel) = ($abs, $vol, $cwd, $rel);
let b = path.is_absolute();
assert_eq!(path.is_absolute(), asb);
assert_eq!(path.is_absolute(), abs);
assert_eq!(is_vol_relative(&path), vol);
assert_eq!(is_cwd_relative(&path), cwd);
assert_eq!(path.is_relative(), rel);
@ -1955,7 +1954,7 @@ mod tests {
let dest = Path::new($dest);
let exp = $exp;
let res = path.is_ancestor_of(&dest);
assert_eq!(Path::new($path).is_ancestor_of(Path::new($dest)), $exp);
assert_eq!(res, exp);
}
)
}
@ -2084,7 +2083,7 @@ mod tests {
macro_rules! t {
(s: $path:expr, $other:expr, $exp:expr) => (
{
assert_eq!(Path::new($path).path_relative_from(Path::new($other))
assert_eq!(Path::new($path).path_relative_from(&Path::new($other))
.as_ref().and_then(|x| x.as_str()), $exp);
}
)