diff options
Diffstat (limited to 'src/libstd/path')
| -rw-r--r-- | src/libstd/path/posix.rs | 45 | ||||
| -rw-r--r-- | src/libstd/path/windows.rs | 44 |
2 files changed, 44 insertions, 45 deletions
diff --git a/src/libstd/path/posix.rs b/src/libstd/path/posix.rs index dcd08295331..ddfb43ed56f 100644 --- a/src/libstd/path/posix.rs +++ b/src/libstd/path/posix.rs @@ -523,35 +523,35 @@ mod tests { use path::null_byte::cond; let mut handled = false; - let mut p = do cond.trap(|v| { + let mut p = cond.trap(|v| { handled = true; assert_eq!(v.as_slice(), b!("foo/bar", 0)); (b!("/bar").to_owned()) - }).inside { + }).inside(|| { Path::new(b!("foo/bar", 0)) - }; + }); assert!(handled); assert_eq!(p.as_vec(), b!("/bar")); handled = false; - do cond.trap(|v| { + cond.trap(|v| { handled = true; assert_eq!(v.as_slice(), b!("f", 0, "o")); (b!("foo").to_owned()) - }).inside { + }).inside(|| { p.set_filename(b!("f", 0, "o")) - }; + }); assert!(handled); assert_eq!(p.as_vec(), b!("/foo")); handled = false; - do cond.trap(|v| { + cond.trap(|v| { handled = true; assert_eq!(v.as_slice(), b!("f", 0, "o")); (b!("foo").to_owned()) - }).inside { + }).inside(|| { p.push(b!("f", 0, "o")); - }; + }); assert!(handled); assert_eq!(p.as_vec(), b!("/foo/foo")); } @@ -573,29 +573,29 @@ mod tests { ) t!(~"new() w/nul" => { - do cond.trap(|_| { + cond.trap(|_| { (b!("null", 0).to_owned()) - }).inside { + }).inside(|| { Path::new(b!("foo/bar", 0)) - }; + }); }) t!(~"set_filename w/nul" => { let mut p = Path::new(b!("foo/bar")); - do cond.trap(|_| { + cond.trap(|_| { (b!("null", 0).to_owned()) - }).inside { + }).inside(|| { p.set_filename(b!("foo", 0)) - }; + }); }) t!(~"push w/nul" => { let mut p = Path::new(b!("foo/bar")); - do cond.trap(|_| { + cond.trap(|_| { (b!("null", 0).to_owned()) - }).inside { + }).inside(|| { p.push(b!("foo", 0)) - }; + }); }) } @@ -621,10 +621,10 @@ mod tests { { let mut called = false; let path = Path::new($path); - do path.display().with_str |s| { + path.display().with_str(|s| { assert_eq!(s, $exp); called = true; - }; + }); assert!(called); } ); @@ -632,11 +632,10 @@ mod tests { { let mut called = false; let path = Path::new($path); - do path.filename_display().with_str |s| { + path.filename_display().with_str(|s| { assert_eq!(s, $exp); called = true; - - }; + }); assert!(called); } ) diff --git a/src/libstd/path/windows.rs b/src/libstd/path/windows.rs index 4e736458fd8..cc2af54fd10 100644 --- a/src/libstd/path/windows.rs +++ b/src/libstd/path/windows.rs @@ -1248,35 +1248,35 @@ mod tests { use path::null_byte::cond; let mut handled = false; - let mut p = do cond.trap(|v| { + let mut p = cond.trap(|v| { handled = true; assert_eq!(v.as_slice(), b!("foo\\bar", 0)); (b!("\\bar").to_owned()) - }).inside { + }).inside(|| { Path::new(b!("foo\\bar", 0)) - }; + }); assert!(handled); assert_eq!(p.as_vec(), b!("\\bar")); handled = false; - do cond.trap(|v| { + cond.trap(|v| { handled = true; assert_eq!(v.as_slice(), b!("f", 0, "o")); (b!("foo").to_owned()) - }).inside { + }).inside(|| { p.set_filename(b!("f", 0, "o")) - }; + }); assert!(handled); assert_eq!(p.as_vec(), b!("\\foo")); handled = false; - do cond.trap(|v| { + cond.trap(|v| { handled = true; assert_eq!(v.as_slice(), b!("f", 0, "o")); (b!("foo").to_owned()) - }).inside { + }).inside(|| { p.push(b!("f", 0, "o")); - }; + }); assert!(handled); assert_eq!(p.as_vec(), b!("\\foo\\foo")); } @@ -1298,29 +1298,29 @@ mod tests { ) t!(~"from_vec() w\\nul" => { - do cond.trap(|_| { + cond.trap(|_| { (b!("null", 0).to_owned()) - }).inside { + }).inside(|| { Path::new(b!("foo\\bar", 0)) - }; + }); }) t!(~"set_filename w\\nul" => { let mut p = Path::new(b!("foo\\bar")); - do cond.trap(|_| { + cond.trap(|_| { (b!("null", 0).to_owned()) - }).inside { + }).inside(|| { p.set_filename(b!("foo", 0)) - }; + }); }) t!(~"push w\\nul" => { let mut p = Path::new(b!("foo\\bar")); - do cond.trap(|_| { + cond.trap(|_| { (b!("null", 0).to_owned()) - }).inside { + }).inside(|| { p.push(b!("foo", 0)) - }; + }); }) } @@ -1339,17 +1339,17 @@ mod tests { let mut called = false; let path = Path::new("foo"); - do path.display().with_str |s| { + path.display().with_str(|s| { assert_eq!(s, "foo"); called = true; - }; + }); assert!(called); called = false; let path = Path::new(b!("\\")); - do path.filename_display().with_str |s| { + path.filename_display().with_str(|s| { assert_eq!(s, ""); called = true; - } + }); assert!(called); } |