bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #24452 - tbu-:pr_file_path, r=aturon

Browse source 
Fixes #22190.
This commit is contained in:
Manish Goregaokar 2015-04-17 18:14:17 +05:30
commit 3118cd7dad
1 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/libstd/fs.rs
View file

@ -51,7 +51,6 @@ use vec::Vec;
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
pub struct File { pub struct File {
inner: fs_imp::File, inner: fs_imp::File,
path: Option<PathBuf>,
} }
/// Metadata information about a file. /// Metadata information about a file.
@ -193,12 +192,12 @@ impl File {
OpenOptions::new().write(true).create(true).truncate(true).open(path) OpenOptions::new().write(true).create(true).truncate(true).open(path)
} }
/// Returns the original path that was used to open this file. /// Returns `None`.
#[unstable(feature = "file_path", #[unstable(feature = "file_path",
reason = "this abstraction is imposed by this library instead \ reason = "this abstraction was imposed by this library and was removed")]
of the underlying OS and may be removed")] #[deprecated(since = "1.0.0", reason = "abstraction was removed")]
pub fn path(&self) -> Option<&Path> { pub fn path(&self) -> Option<&Path> {
self.path.as_ref().map(|p| &**p) None
} }
/// Attempts to sync all OS-internal metadata to disk. /// Attempts to sync all OS-internal metadata to disk.
@ -302,7 +301,7 @@ impl AsInner<fs_imp::File> for File {
} }
impl FromInner<fs_imp::File> for File { impl FromInner<fs_imp::File> for File {
fn from_inner(f: fs_imp::File) -> File { fn from_inner(f: fs_imp::File) -> File {
File { inner: f, path: None } File { inner: f }
} }
} }
@ -470,7 +469,7 @@ impl OpenOptions {
pub fn open<P: AsRef<Path>>(&self, path: P) -> io::Result<File> { pub fn open<P: AsRef<Path>>(&self, path: P) -> io::Result<File> {
let path = path.as_ref(); let path = path.as_ref();
let inner = try!(fs_imp::File::open(path, &self.0)); let inner = try!(fs_imp::File::open(path, &self.0));
Ok(File { path: Some(path.to_path_buf()), inner: inner }) Ok(File { inner: inner })
} }
} }