Merge branch 'convert-openoptions-cint' of github.com:FedericoPonzi/rust into convert-openoptions-cint

Federico Ponzi · Federico Ponzi · commit 2c9e27b759a9 · 2020-08-31T16:02:12.000+02:00
diff --git a/library/std/src/sys/unix/fs.rs b/library/std/src/sys/unix/fs.rs
@@ -966,7 +966,6 @@ pub fn rename(old: &Path, new: &Path) -> io::Result<()> {
     Ok(())
 }
 
-
 pub fn set_perm(p: &Path, perm: FilePermissions) -> io::Result<()> {
     let p = cstr(p)?;
     cvt_r(|| unsafe { libc::chmod(p.as_ptr(), perm.mode) })?;

Original file line number	Diff line number	Diff line change
`@@ -966,7 +966,6 @@ pub fn rename(old: &Path, new: &Path) -> io::Result<()> {`
`966`	`966`	`Ok(())`
`967`	`967`	`}`
`968`	`968`
`969`		`-`
`970`	`969`	`pub fn set_perm(p: &Path, perm: FilePermissions) -> io::Result<()> {`
`971`	`970`	`let p = cstr(p)?;`
`972`	`971`	`cvt_r(\|\| unsafe { libc::chmod(p.as_ptr(), perm.mode) })?;`