Merge pull request #77 from tomstokes/fix-clippy-errors

Fix clippy errors in sample code

Author: PolyMeilex

README.md

@@ -35,7 +35,7 @@ Configure and run event loop:
 
 ```rust
 use input::{Libinput, LibinputInterface};
-use libc::{O_RDONLY, O_RDWR, O_WRONLY};
+use libc::{O_ACCMODE, O_RDONLY, O_RDWR, O_WRONLY};
 use std::fs::{File, OpenOptions};
 use std::os::unix::{fs::OpenOptionsExt, io::OwnedFd};
 use std::path::Path;
@@ -46,8 +46,8 @@ impl LibinputInterface for Interface {
     fn open_restricted(&mut self, path: &Path, flags: i32) -> Result<OwnedFd, i32> {
         OpenOptions::new()
             .custom_flags(flags)
-            .read((flags & O_RDONLY != 0) | (flags & O_RDWR != 0))
-            .write((flags & O_WRONLY != 0) | (flags & O_RDWR != 0))
+            .read((flags & O_ACCMODE == O_RDONLY) | (flags & O_ACCMODE == O_RDWR))
+            .write((flags & O_ACCMODE == O_WRONLY) | (flags & O_ACCMODE == O_RDWR))
             .open(path)
             .map(|file| file.into())
             .map_err(|err| err.raw_os_error().unwrap())

src/context.rs

@@ -351,7 +351,7 @@ impl Libinput {
     /// # use std::fs::{File, OpenOptions};
     /// # use std::os::unix::{fs::OpenOptionsExt, io::OwnedFd};
     /// # use std::path::Path;
-    /// # use libc::{O_RDONLY, O_RDWR, O_WRONLY};
+    /// # use libc::{O_ACCMODE, O_RDONLY, O_RDWR, O_WRONLY};
     /// #
     /// use input::{Libinput, LibinputInterface};
     /// use rustix::event::{poll, PollFlags, PollFd};
@@ -362,8 +362,8 @@ impl Libinput {
     /// #     fn open_restricted(&mut self, path: &Path, flags: i32) -> Result<OwnedFd, i32> {
     /// #         OpenOptions::new()
     /// #             .custom_flags(flags)
-    /// #             .read((flags & O_RDONLY != 0) | (flags & O_RDWR != 0))
-    /// #             .write((flags & O_WRONLY != 0) | (flags & O_RDWR != 0))
+    /// #             .read((flags & O_ACCMODE == O_RDONLY) | (flags & O_ACCMODE == O_RDWR))
+    /// #             .write((flags & O_ACCMODE == O_WRONLY) | (flags & O_ACCMODE == O_RDWR))
     /// #             .open(path)
     /// #             .map(|file| file.into())
     /// #             .map_err(|err| err.raw_os_error().unwrap())

src/lib.rs

@@ -39,16 +39,16 @@
 //! use std::path::Path;
 //!
 //! extern crate libc;
-//! use libc::{O_RDONLY, O_RDWR, O_WRONLY};
+//! use libc::{O_ACCMODE, O_RDONLY, O_RDWR, O_WRONLY};
 //!
 //! struct Interface;
 //!
 //! impl LibinputInterface for Interface {
 //!     fn open_restricted(&mut self, path: &Path, flags: i32) -> Result<OwnedFd, i32> {
 //!         OpenOptions::new()
 //!             .custom_flags(flags)
-//!             .read((flags & O_RDONLY != 0) | (flags & O_RDWR != 0))
-//!             .write((flags & O_WRONLY != 0) | (flags & O_RDWR != 0))
+//!             .read((flags & O_ACCMODE == O_RDONLY) | (flags & O_ACCMODE == O_RDWR))
+//!             .write((flags & O_ACCMODE == O_WRONLY) | (flags & O_ACCMODE == O_RDWR))
 //!             .open(path)
 //!             .map(|file| file.into())
 //!             .map_err(|err| err.raw_os_error().unwrap())