mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update OpenOptions::as_flags docs, and minor styling

Browse Source
This commit is contained in:
Federico Ponzi 2020-08-31 21:42:57 +02:00
parent 2c9e27b759
commit 7c1e5c1dcd
No known key found for this signature in database
GPG Key ID: CFA9CCFE5363D0C6
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
library/std/src/sys/unix/ext/fs.rs
View File

@ -346,9 +346,13 @@ pub trait OpenOptionsExt {
#[stable(feature = "open_options_ext", since = "1.10.0")]
fn custom_flags(&mut self, flags: i32) -> &mut Self;
/// Get the flags of this OpenOptions as libc::c_int.
/// Get the flags of this OpenOptions as [`libc::c_int`].
/// With: [`libc::open`]
///
/// This method allows the reuse of the OpenOptions as flags argument for `libc::open()`.
/// This method allows the reuse of the OpenOptions as flags argument for [`fs::OpenOptions`].
///
/// [`libc::c_int`]: https://docs.rs/libc/*/libc/type.c_int.html
/// [`libc::open`]: https://docs.rs/libc/*/libc/fn.open.html
///
/// # Examples
///
@ -359,16 +363,10 @@ pub trait OpenOptionsExt {
/// use std::fs::OpenOptions;
/// use std::os::unix::fs::OpenOptionsExt;
///
/// # fn main() {
/// let mut options = OpenOptions::new();
/// options.write(true).read(true);
/// if cfg!(unix) {
/// options.custom_flags(libc::O_NOFOLLOW);
/// }
/// let file_name = CString::new("foo.txt").unwrap();
/// let file = unsafe{ libc::open(file_name.as_c_str().as_ptr(), options.as_flags().unwrap()) };
///
/// # }
/// let file = unsafe { libc::open(file_name.as_c_str().as_ptr(), options.as_flags().unwrap()) };
/// ```
#[stable(feature = "open_options_ext_as_flags", since = "1.47.0")]
fn as_flags(&self) -> io::Result<libc::c_int>;
@ -385,6 +383,7 @@ fn custom_flags(&mut self, flags: i32) -> &mut OpenOptions {
self.as_inner_mut().custom_flags(flags);
self
}
fn as_flags(&self) -> io::Result<libc::c_int> {
self.as_inner().as_flags()
}

1
library/std/src/sys/unix/fs.rs
View File

@ -660,6 +660,7 @@ pub fn as_flags(&self) -> io::Result<c_int> {
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),