---

yaml
---
r: 145944
b: refs/heads/try2
c: 3a2735c
h: refs/heads/master
v: v3

Author: lilyball

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 179f50f7c8a4071eb4e28e5b812106d6a3c148c7
+refs/heads/try2: 3a2735cb11efc997aa02646c13c008a883de6792
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/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! {