auto merge of #6960 : msullivan/rust/fix-pollution, r=brson

bors · bors · commit 4a19af1b03c0 · 2013-06-05T19:55:36.000-07:00
diff --git a/src/test/run-pass/stat.rs b/src/test/run-pass/stat.rs
@@ -20,7 +20,7 @@ use std::uint;
 
 pub fn main() {
     let dir = tempfile::mkdtemp(&Path("."), "").unwrap();
-    let path = dir.with_filename("file");
+    let path = dir.push("file");
 
     {
         match io::file_writer(&path, [io::Create, io::Truncate]) {
@@ -36,5 +36,6 @@ pub fn main() {
     assert!(path.exists());
     assert_eq!(path.get_size(), Some(1000));
 
+    os::remove_file(&path);
     os::remove_dir(&dir);
 }

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ use std::uint;`
`20`	`20`
`21`	`21`	`pub fn main() {`
`22`	`22`	`let dir = tempfile::mkdtemp(&Path("."), "").unwrap();`
`23`		`- let path = dir.with_filename("file");`
	`23`	`+ let path = dir.push("file");`
`24`	`24`
`25`	`25`	`{`
`26`	`26`	`match io::file_writer(&path, [io::Create, io::Truncate]) {`
`@@ -36,5 +36,6 @@ pub fn main() {`
`36`	`36`	`assert!(path.exists());`
`37`	`37`	`assert_eq!(path.get_size(), Some(1000));`
`38`	`38`
	`39`	`+ os::remove_file(&path);`
`39`	`40`	`os::remove_dir(&dir);`
`40`	`41`	`}`