diff options
| author | bors <bors@rust-lang.org> | 2015-05-23 15:57:48 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-05-23 15:57:48 +0000 |
| commit | 4ee6820911d29b9abf0b0f0481d065bc6ae5f7d6 (patch) | |
| tree | 946a90dd01ad0526306d5a709750cbf730d3230e /src/libstd | |
| parent | 88e6976acf2e7ea3b13598bbc42fa543107eddcd (diff) | |
| parent | 945c50d9748d0ddb497ff1bf68742c96ed3ae4ca (diff) | |
| download | rust-4ee6820911d29b9abf0b0f0481d065bc6ae5f7d6.tar.gz rust-4ee6820911d29b9abf0b0f0481d065bc6ae5f7d6.zip | |
Auto merge of #25667 - lambda:rename-soft_link-to-symlink-landed-in-1.1, r=aturon
The change to split up soft_link to OS-specific symlink, symlink_file, and symlink_dir didn't actually land in 1.0.0. Update the stability and deprecation attributes to correctly indicate that these changes happend in 1.1.0.
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/fs.rs | 2 | ||||
| -rw-r--r-- | src/libstd/sys/unix/ext/fs.rs | 2 | ||||
| -rw-r--r-- | src/libstd/sys/windows/ext/fs.rs | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/libstd/fs.rs b/src/libstd/fs.rs index cb59f020e29..31b427d3fa7 100644 --- a/src/libstd/fs.rs +++ b/src/libstd/fs.rs @@ -949,7 +949,7 @@ pub fn hard_link<P: AsRef<Path>, Q: AsRef<Path>>(src: P, dst: Q) -> io::Result<( /// # Ok(()) /// # } /// ``` -#[deprecated(since = "1.0.0", +#[deprecated(since = "1.1.0", reason = "replaced with std::os::unix::fs::symlink and \ std::os::windows::fs::{symlink_file, symlink_dir}")] #[stable(feature = "rust1", since = "1.0.0")] diff --git a/src/libstd/sys/unix/ext/fs.rs b/src/libstd/sys/unix/ext/fs.rs index a6953437497..7d982152dd6 100644 --- a/src/libstd/sys/unix/ext/fs.rs +++ b/src/libstd/sys/unix/ext/fs.rs @@ -184,7 +184,7 @@ impl DirEntryExt for fs::DirEntry { /// # Ok(()) /// # } /// ``` -#[stable(feature = "rust1", since = "1.0.0")] +#[stable(feature = "symlink", since = "1.1.0")] pub fn symlink<P: AsRef<Path>, Q: AsRef<Path>>(src: P, dst: Q) -> io::Result<()> { sys::fs::symlink(src.as_ref(), dst.as_ref()) diff --git a/src/libstd/sys/windows/ext/fs.rs b/src/libstd/sys/windows/ext/fs.rs index 822e1b370c2..aaffe8dadf8 100644 --- a/src/libstd/sys/windows/ext/fs.rs +++ b/src/libstd/sys/windows/ext/fs.rs @@ -122,7 +122,7 @@ impl MetadataExt for Metadata { /// # Ok(()) /// # } /// ``` -#[stable(feature = "rust1", since = "1.0.0")] +#[stable(feature = "symlink", since = "1.1.0")] pub fn symlink_file<P: AsRef<Path>, Q: AsRef<Path>>(src: P, dst: Q) -> io::Result<()> { sys::fs::symlink_inner(src.as_ref(), dst.as_ref(), false) @@ -143,7 +143,7 @@ pub fn symlink_file<P: AsRef<Path>, Q: AsRef<Path>>(src: P, dst: Q) /// # Ok(()) /// # } /// ``` -#[stable(feature = "rust1", since = "1.0.0")] +#[stable(feature = "symlink", since = "1.1.0")] pub fn symlink_dir<P: AsRef<Path>, Q: AsRef<Path>>(src: P, dst: Q) -> io::Result<()> { sys::fs::symlink_inner(src.as_ref(), dst.as_ref(), true) |