---

yaml
---
r: 30170
b: refs/heads/incoming
c: 6d22a80
h: refs/heads/master
v: v3

Author: graydon

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: cb8ecd79849160d8cff2eff8b070efd7f9a3b9a7
+refs/heads/incoming: 6d22a805d73c6b6f42e496fc23cffbf6ffeeed1b
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/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)]

branches/incoming/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};

branches/incoming/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());