---

yaml
---
r: 83127
b: refs/heads/auto
c: 3a2735c
h: refs/heads/master
i:
  83125: 0c60760
  83123: 441ae3d
  83119: 9dcdafe
v: v3

Author: lilyball

[refs]

@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 179f50f7c8a4071eb4e28e5b812106d6a3c148c7
+refs/heads/auto: 3a2735cb11efc997aa02646c13c008a883de6792
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/libstd/path2/mod.rs

@@ -21,38 +21,38 @@ use vec;
 use vec::{CopyableVector, OwnedCopyableVector, OwnedVector};
 use vec::{ImmutableEqVector, ImmutableVector};
 
-pub mod posix;
-pub mod windows;
-
 /// Typedef for POSIX file paths.
 /// See `posix::Path` for more info.
-pub type PosixPath = posix::Path;
+pub use PosixPath = self::posix::Path;
 
 /// Typedef for Windows file paths.
 /// See `windows::Path` for more info.
-pub type WindowsPath = windows::Path;
+pub use WindowsPath = self::windows::Path;
 
 /// Typedef for the platform-native path type
 #[cfg(unix)]
-pub type Path = PosixPath;
+pub use Path = self::posix::Path;
 /// Typedef for the platform-native path type
 #[cfg(windows)]
-pub type Path = WindowsPath;
+pub use Path = self::windows::Path;
 
 /// Typedef for the POSIX path component iterator.
 /// See `posix::ComponentIter` for more info.
-pub type PosixComponentIter<'self> = posix::ComponentIter<'self>;
+pub use PosixComponentIter = self::posix::ComponentIter;
 
-// /// Typedef for the Windows path component iterator.
-// /// See `windows::ComponentIter` for more info.
-// pub type WindowsComponentIter<'self> = windows::ComponentIter<'self>;
+/// Typedef for the Windows path component iterator.
+/// See `windows::ComponentIter` for more info.
+pub use WindowsComponentIter = self::windows::ComponentIter;
 
 /// Typedef for the platform-native component iterator
 #[cfg(unix)]
-pub type ComponentIter<'self> = PosixComponentIter<'self>;
-// /// Typedef for the platform-native component iterator
-//#[cfg(windows)]
-//pub type ComponentIter<'self> = WindowsComponentIter<'self>;
+pub use ComponentIter = self::posix::ComponentIter;
+/// Typedef for the platform-native component iterator
+#[cfg(windows)]
+pub use ComponentIter = self::windows::ComponentIter;
+
+pub mod posix;
+pub mod windows;
 
 // Condition that is raised when a NUL is found in a byte vector given to a Path function
 condition! {