From 0dd4c1e7bd0178ca91ea13dfad6efc4cce728302 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Thu, 22 May 2014 10:40:07 -0700 Subject: Remove a slew of old deprecated functions --- src/libstd/path/mod.rs | 12 ------------ src/libstd/path/posix.rs | 22 +--------------------- src/libstd/path/windows.rs | 25 +------------------------ 3 files changed, 2 insertions(+), 57 deletions(-) (limited to 'src/libstd/path') diff --git a/src/libstd/path/mod.rs b/src/libstd/path/mod.rs index 2960d55f337..b6550a9d77b 100644 --- a/src/libstd/path/mod.rs +++ b/src/libstd/path/mod.rs @@ -96,28 +96,16 @@ pub use Path = self::windows::Path; /// Typedef for the platform-native component iterator #[cfg(unix)] pub use Components = self::posix::Components; -/// Typedef for the platform-native reverse component iterator -#[cfg(unix)] -pub use RevComponents = self::posix::RevComponents; /// Typedef for the platform-native component iterator #[cfg(windows)] pub use Components = self::windows::Components; -/// Typedef for the platform-native reverse component iterator -#[cfg(windows)] -pub use RevComponents = self::windows::RevComponents; /// Typedef for the platform-native str component iterator #[cfg(unix)] pub use StrComponents = self::posix::StrComponents; -/// Typedef for the platform-native reverse str component iterator -#[cfg(unix)] -pub use RevStrComponents = self::posix::RevStrComponents; /// Typedef for the platform-native str component iterator #[cfg(windows)] pub use StrComponents = self::windows::StrComponents; -/// Typedef for the platform-native reverse str component iterator -#[cfg(windows)] -pub use RevStrComponents = self::windows::RevStrComponents; /// Alias for the platform-native separator character. #[cfg(unix)] diff --git a/src/libstd/path/posix.rs b/src/libstd/path/posix.rs index 4f7132dc6e4..9517d6618a9 100644 --- a/src/libstd/path/posix.rs +++ b/src/libstd/path/posix.rs @@ -16,7 +16,7 @@ use clone::Clone; use cmp::{Eq, TotalEq}; use from_str::FromStr; use io::Writer; -use iter::{DoubleEndedIterator, Rev, AdditiveIterator, Extendable, Iterator, Map}; +use iter::{DoubleEndedIterator, AdditiveIterator, Extendable, Iterator, Map}; use option::{Option, None, Some}; use str; use str::Str; @@ -28,16 +28,10 @@ use super::{BytesContainer, GenericPath, GenericPathUnsafe}; /// Iterator that yields successive components of a Path as &[u8] pub type Components<'a> = Splits<'a, u8>; -/// Iterator that yields components of a Path in reverse as &[u8] -#[deprecated = "replaced by Rev>"] -pub type RevComponents<'a> = Rev>; /// Iterator that yields successive components of a Path as Option<&str> pub type StrComponents<'a> = Map<'a, &'a [u8], Option<&'a str>, Components<'a>>; -/// Iterator that yields components of a Path in reverse as Option<&str> -#[deprecated = "replaced by Rev>"] -pub type RevStrComponents<'a> = Rev>; /// Represents a POSIX file path #[deriving(Clone)] @@ -414,25 +408,11 @@ impl Path { ret } - /// Returns an iterator that yields each component of the path in reverse. - /// See components() for details. - #[deprecated = "replaced by .components().rev()"] - pub fn rev_components<'a>(&'a self) -> Rev> { - self.components().rev() - } - /// Returns an iterator that yields each component of the path as Option<&str>. /// See components() for details. pub fn str_components<'a>(&'a self) -> StrComponents<'a> { self.components().map(str::from_utf8) } - - /// Returns an iterator that yields each component of the path in reverse as Option<&str>. - /// See components() for details. - #[deprecated = "replaced by .str_components().rev()"] - pub fn rev_str_components<'a>(&'a self) -> Rev> { - self.str_components().rev() - } } // None result means the byte vector didn't need normalizing diff --git a/src/libstd/path/windows.rs b/src/libstd/path/windows.rs index 176788edcc4..be9472338cd 100644 --- a/src/libstd/path/windows.rs +++ b/src/libstd/path/windows.rs @@ -17,7 +17,7 @@ use cmp::{Eq, TotalEq}; use container::Container; use from_str::FromStr; use io::Writer; -use iter::{AdditiveIterator, DoubleEndedIterator, Extendable, Rev, Iterator, Map}; +use iter::{AdditiveIterator, DoubleEndedIterator, Extendable, Iterator, Map}; use mem; use option::{Option, Some, None}; use slice::{Vector, OwnedVector, ImmutableVector}; @@ -33,19 +33,10 @@ use super::{contains_nul, BytesContainer, GenericPath, GenericPathUnsafe}; /// every component in WindowsPath is guaranteed to be Some. pub type StrComponents<'a> = Map<'a, &'a str, Option<&'a str>, CharSplits<'a, char>>; -/// Iterator that yields components of a Path in reverse as &str -/// -/// Each component is yielded as Option<&str> for compatibility with PosixPath, but -/// every component in WindowsPath is guaranteed to be Some. -#[deprecated = "replaced by Rev>"] -pub type RevStrComponents<'a> = Rev>; /// Iterator that yields successive components of a Path as &[u8] pub type Components<'a> = Map<'a, Option<&'a str>, &'a [u8], StrComponents<'a>>; -/// Iterator that yields components of a Path in reverse as &[u8] -#[deprecated = "replaced by Rev>"] -pub type RevComponents<'a> = Rev>; /// Represents a Windows path // Notes for Windows path impl: @@ -650,13 +641,6 @@ impl Path { ret } - /// Returns an iterator that yields each component of the path in reverse as an Option<&str> - /// See str_components() for details. - #[deprecated = "replaced by .str_components().rev()"] - pub fn rev_str_components<'a>(&'a self) -> Rev> { - self.str_components().rev() - } - /// Returns an iterator that yields each component of the path in turn as a &[u8]. /// See str_components() for details. pub fn components<'a>(&'a self) -> Components<'a> { @@ -667,13 +651,6 @@ impl Path { self.str_components().map(convert) } - /// Returns an iterator that yields each component of the path in reverse as a &[u8]. - /// See str_components() for details. - #[deprecated = "replaced by .components().rev()"] - pub fn rev_components<'a>(&'a self) -> Rev> { - self.components().rev() - } - fn equiv_prefix(&self, other: &Path) -> bool { let s_repr = self.repr.as_slice(); let o_repr = other.repr.as_slice(); -- cgit 1.4.1-3-g733a5