From 72c8f3772bdca40ff2be2908aaf6b6a73d1c7821 Mon Sep 17 00:00:00 2001 From: Marvin Löbel Date: Thu, 18 Dec 2014 02:12:53 +0100 Subject: Prepared most `StrExt` pattern using methods for stabilization Made iterator-returning methods return newtypes Adjusted some docs to be forwards compatible with a generic pattern API --- src/libstd/path/windows.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/libstd') diff --git a/src/libstd/path/windows.rs b/src/libstd/path/windows.rs index 7d10188c437..4cb2e496d92 100644 --- a/src/libstd/path/windows.rs +++ b/src/libstd/path/windows.rs @@ -26,7 +26,7 @@ use mem; use option::Option; use option::Option::{Some, None}; use slice::SliceExt; -use str::{CharSplits, FromStr, StrVector, StrExt}; +use str::{SplitTerminator, FromStr, StrVector, StrExt}; use string::{String, ToString}; use unicode::char::UnicodeChar; use vec::Vec; @@ -38,7 +38,7 @@ use super::{contains_nul, BytesContainer, GenericPath, GenericPathUnsafe}; /// Each component is yielded as Option<&str> for compatibility with PosixPath, but /// every component in WindowsPath is guaranteed to be Some. pub type StrComponents<'a> = - Map<&'a str, Option<&'a str>, CharSplits<'a, char>, fn(&'a str) -> Option<&'a str>>; + Map<&'a str, Option<&'a str>, SplitTerminator<'a, char>, fn(&'a str) -> Option<&'a str>>; /// Iterator that yields successive components of a Path as &[u8] pub type Components<'a> = -- cgit 1.4.1-3-g733a5