---

yaml
---
r: 82359
b: refs/heads/master
c: 3a2735c
h: refs/heads/master
i:
  82357: ac3874d
  82355: 974d13d
  82351: 2647936
v: v3

Author: lilyball

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 179f50f7c8a4071eb4e28e5b812106d6a3c148c7
+refs/heads/master: 3a2735cb11efc997aa02646c13c008a883de6792
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 6c08cc2db4f98e9f07ae7d50338396c4123c2f0a
 refs/heads/try: 70152ff55722878cde684ee6462c14c65f2c4729

trunk/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! {