Replace core::path with contents of core::path2. Back to one path module.

Author: graydon

src/libcore/core.rc

@@ -54,7 +54,7 @@ export send_map;
 export hash;
 export cmp;
 export num;
-export path, path2;
+export path;
 export managed;
 export flate;
 
@@ -254,7 +254,6 @@ mod libc;
 mod os;
 #[warn(non_camel_case_types)]
 mod path;
-mod path2;
 #[warn(non_camel_case_types)]
 mod rand;
 #[warn(non_camel_case_types)]

src/libcore/core.rs

@@ -10,10 +10,10 @@ import option = option::Option;
 
 import result::{Result, Ok, Err};
 
-import Path = path2::Path;
-import GenericPath = path2::GenericPath;
-import WindowsPath = path2::WindowsPath;
-import PosixPath = path2::PosixPath;
+import Path = path::Path;
+import GenericPath = path::GenericPath;
+import WindowsPath = path::WindowsPath;
+import PosixPath = path::PosixPath;
 
 import tuple::{TupleOps, ExtendedTupleOps};
 import str::{StrSlice, UniqueStr};

src/libcore/os.rs

@@ -914,7 +914,7 @@ mod tests {
 
     #[test]
     fn test() {
-        assert (!path::path_is_absolute(~"test-path"));
+        assert (!Path("test-path").is_absolute);
 
         log(debug, ~"Current working directory: " + getcwd().to_str());