diff options
| author | Joshua Nelson <joshua@yottadb.com> | 2020-09-22 23:07:30 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-22 23:07:30 -0400 |
| commit | 15f08d6ddfa1d6e50f783196bd63cacf7d015b3e (patch) | |
| tree | f1291107956b1efec99791ccc2fa76c23a48f4a4 | |
| parent | 6d3acf5129767db78a3d9d62e814ec86b8870d75 (diff) | |
| download | rust-15f08d6ddfa1d6e50f783196bd63cacf7d015b3e.tar.gz rust-15f08d6ddfa1d6e50f783196bd63cacf7d015b3e.zip | |
Revert "Function to convert OpenOptions to c_int"
| -rw-r--r-- | library/std/src/sys/unix/ext/fs.rs | 29 | ||||
| -rw-r--r-- | library/std/src/sys/unix/fs.rs | 6 |
2 files changed, 0 insertions, 35 deletions
diff --git a/library/std/src/sys/unix/ext/fs.rs b/library/std/src/sys/unix/ext/fs.rs index 83cbe25d41b..4b9f4ceb29c 100644 --- a/library/std/src/sys/unix/ext/fs.rs +++ b/library/std/src/sys/unix/ext/fs.rs @@ -348,31 +348,6 @@ pub trait OpenOptionsExt { /// ``` #[stable(feature = "open_options_ext", since = "1.10.0")] fn custom_flags(&mut self, flags: i32) -> &mut Self; - - /// Get the flags as [`libc::c_int`]. - /// - /// This method allows the reuse of the OpenOptions as flags argument for [`libc::open`]. - /// - /// [`libc::c_int`]: https://docs.rs/libc/*/libc/type.c_int.html - /// [`libc::open`]: https://docs.rs/libc/*/libc/fn.open.html - /// - /// # Examples - /// - /// ```no_run - /// # #![feature(rustc_private)] - /// #![feature(open_options_ext_as_flags)] - /// extern crate libc; - /// use std::ffi::CString; - /// use std::fs::OpenOptions; - /// use std::os::unix::fs::OpenOptionsExt; - /// - /// let mut options = OpenOptions::new(); - /// options.write(true).read(true); - /// let file_name = CString::new("foo.txt").unwrap(); - /// let file = unsafe { libc::open(file_name.as_c_str().as_ptr(), options.as_flags().unwrap()) }; - /// ``` - #[unstable(feature = "open_options_ext_as_flags", issue = "76801")] - fn as_flags(&self) -> io::Result<libc::c_int>; } #[stable(feature = "fs_ext", since = "1.1.0")] @@ -386,10 +361,6 @@ impl OpenOptionsExt for OpenOptions { self.as_inner_mut().custom_flags(flags); self } - - fn as_flags(&self) -> io::Result<libc::c_int> { - self.as_inner().as_flags() - } } /// Unix-specific extensions to [`fs::Metadata`]. diff --git a/library/std/src/sys/unix/fs.rs b/library/std/src/sys/unix/fs.rs index 09954f0c43c..566ac0920dc 100644 --- a/library/std/src/sys/unix/fs.rs +++ b/library/std/src/sys/unix/fs.rs @@ -656,12 +656,6 @@ impl OpenOptions { self.mode = mode as mode_t; } - pub fn as_flags(&self) -> io::Result<c_int> { - let access_mode = self.get_access_mode()?; - let creation_mode = self.get_creation_mode()?; - Ok(creation_mode | access_mode | self.custom_flags) - } - fn get_access_mode(&self) -> io::Result<c_int> { match (self.read, self.write, self.append) { (true, false, false) => Ok(libc::O_RDONLY), |
