bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

rollup merge of #24636: alexcrichton/remove-deprecated

Browse source 
Conflicts:
	src/libcore/result.rs
This commit is contained in:
Alex Crichton 2015-04-21 15:28:53 -07:00
commit a1dd5ac787
197 changed files with 1373 additions and 6413 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/libstd/path.rs
View file

@ -110,7 +110,7 @@ use string::String;
use vec::Vec;
use fmt;
use ffi::{OsStr, OsString, AsOsStr};
use ffi::{OsStr, OsString};
use self::platform::{is_sep_byte, is_verbatim_sep, MAIN_SEP_STR, parse_prefix};
@ -1184,14 +1184,6 @@ impl AsRef<OsStr> for PathBuf {
}
}
#[stable(feature = "rust1", since = "1.0.0")]
#[deprecated(since = "1.0.0", reason = "trait is deprecated")]
impl AsOsStr for PathBuf {
fn as_os_str(&self) -> &OsStr {
&self.inner[..]
}
}
#[stable(feature = "rust1", since = "1.0.0")]
impl Into<OsString> for PathBuf {
fn into(self) -> OsString {
@ -1652,14 +1644,6 @@ impl AsRef<OsStr> for Path {
}
}
#[stable(feature = "rust1", since = "1.0.0")]
#[deprecated(since = "1.0.0", reason = "trait is deprecated")]
impl AsOsStr for Path {
fn as_os_str(&self) -> &OsStr {
&self.inner
}
}
#[stable(feature = "rust1", since = "1.0.0")]
impl fmt::Debug for Path {
fn fmt(&self, formatter: &mut fmt::Formatter) -> Result<(), fmt::Error> {
@ -1711,22 +1695,6 @@ impl cmp::Ord for Path {
}
}
/// Freely convertible to a `Path`.
#[unstable(feature = "std_misc")]
#[deprecated(since = "1.0.0", reason = "use std::convert::AsRef<Path> instead")]
pub trait AsPath {
/// Converts to a `Path`.
#[unstable(feature = "std_misc")]
fn as_path(&self) -> &Path;
}
#[unstable(feature = "std_misc")]
#[deprecated(since = "1.0.0", reason = "use std::convert::AsRef<Path> instead")]
#[allow(deprecated)]
impl<T: AsOsStr + ?Sized> AsPath for T {
fn as_path(&self) -> &Path { Path::new(self.as_os_str()) }
}
#[stable(feature = "rust1", since = "1.0.0")]
impl AsRef<Path> for Path {
fn as_ref(&self) -> &Path { self }