src/cmd/which/mod.rs

@@ -1,4 +1,3 @@
-use crate::{bitflags::BitFlags, mode::Bit};
 use super::Cmd;
 use clap::{Arg, Command};
 use std::{env, fs::File, io, os::unix::prelude::MetadataExt, path::PathBuf, process};
@@ -61,10 +60,10 @@ fn which(command: &str, path: &[&str]) -> Option<String> {
                     let myuid = unsafe { libc::geteuid() };
                     let mygroups = crate::pw::get_gids();
                     // we own the file and it has u+x
-                    if myuid == meta.uid() && mode.contains(Bit::UExec) {
+                    if myuid == meta.uid() && mode & 0o100 != 0 {
                         return Some(format!("{}", file.display()));
                     // file has ug+x
-                    } else if mode.contains(Bit::UExec | Bit::GExec) {
+                    } else if mode & 0o110 != 0 {
                         if let Ok(groups) = mygroups {
                             // one of our groups owns the file
                             if groups.contains(&meta.gid()) {

src/mode/bit.rs

@@ -1,99 +0,0 @@
-use crate::bitflags::BitFlags;
-use std::ops::{BitAnd, BitAndAssign, BitOr, BitOrAssign};
-
-/// Unix permission bit flags
-#[derive(Clone, Copy, PartialEq)]
-pub enum Bit {
-    Suid = 0o4000,
-    Sgid = 0o2000,
-    Sticky = 0o1000,
-    URead = 0o400,
-    UWrite = 0o200,
-    UExec = 0o100,
-    GRead = 0o40,
-    GWrite = 0o20,
-    GExec = 0o10,
-    ORead = 0o4,
-    OWrite = 0o2,
-    OExec = 0o1,
-}
-
-impl BitAnd<u32> for Bit {
-    type Output = u32;
-
-    fn bitand(self, rhs: u32) -> Self::Output {
-        self as u32 & rhs
-    }
-}
-
-impl BitAnd<Bit> for u32 {
-    type Output = u32;
-
-    fn bitand(self, rhs: Bit) -> Self::Output {
-        self & rhs as u32
-    }
-}
-
-impl BitAnd for Bit {
-    type Output = u32;
-
-    fn bitand(self, rhs: Self) -> Self::Output {
-        self as u32 & rhs as u32
-    }
-}
-
-impl BitAndAssign<Bit> for u32 {
-    fn bitand_assign(&mut self, rhs: Bit) {
-        *self = *self & rhs;
-    }
-}
-
-impl BitOr<u32> for Bit {
-    type Output = u32;
-
-    fn bitor(self, rhs: u32) -> Self::Output {
-        self as u32 | rhs
-    }
-}
-
-impl BitOr<Bit> for u32 {
-    type Output = u32;
-
-    fn bitor(self, rhs: Bit) -> Self::Output {
-        self | rhs as u32
-    }
-}
-
-impl BitOr for Bit {
-    type Output = u32;
-
-    fn bitor(self, rhs: Self) -> Self::Output {
-        self as u32 | rhs as u32
-    }
-}
-
-impl BitOrAssign<Bit> for u32 {
-    fn bitor_assign(&mut self, rhs: Bit) {
-        *self = *self | rhs;
-    }
-}
-
-impl Bit {
-    pub fn as_char(&self, mode: u32) -> char {
-        if mode & *self != 0 {
-            match self {
-                Self::Suid | Self::Sgid => 's',
-                Self::Sticky => 't',
-                Self::URead | Self::GRead | Self::ORead => 'r',
-                Self::UWrite | Self::GWrite | Self::OWrite => 'w',
-                Self::UExec if mode.contains(Self::Suid) => 's',
-                Self::GExec if mode.contains(Self::Sgid) => 's',
-                Self::OExec if mode.contains(Self::Sticky) => 't',
-                Self::UExec | Self::GExec | Self::OExec => 'x',
-            }
-        } else {
-            '-'
-        }
-    }
-}
-

src/mode/mod.rs

@@ -1,10 +1,11 @@
 //! Functions for parsing and managing permissions
-mod bit;
 mod parser;
-mod who;
+use std::{
-use std::fmt::{self, Write};
+    fmt::{self, Write},
+    ops::{BitAnd, BitAndAssign, BitOr, BitOrAssign},
+};
 
-pub use {bit::Bit, parser::{ParseError, Parser}, who::Who};
+pub use parser::{ParseError, Parser};
 
 /// Gets the umask for the current user
 #[must_use]
@@ -14,6 +15,42 @@ pub fn get_umask() -> u32 {
     mask
 }
 
+/// Unix permission bit flags
+#[derive(Clone, Copy, PartialEq)]
+pub enum Bit {
+    Suid = 0o4000,
+    Sgid = 0o2000,
+    Sticky = 0o1000,
+    URead = 0o400,
+    UWrite = 0o200,
+    UExec = 0o100,
+    GRead = 0o40,
+    GWrite = 0o20,
+    GExec = 0o10,
+    ORead = 0o4,
+    OWrite = 0o2,
+    OExec = 0o1,
+}
+
+impl Bit {
+    fn as_char(&self, mode: u32) -> char {
+        if mode & *self != 0 {
+            match self {
+                Self::Suid | Self::Sgid => 's',
+                Self::Sticky => 't',
+                Self::URead | Self::GRead | Self::ORead => 'r',
+                Self::UWrite | Self::GWrite | Self::OWrite => 'w',
+                Self::UExec if mode & Self::Suid != 0 => 's',
+                Self::GExec if mode & Self::Sgid != 0 => 's',
+                Self::OExec if mode & Self::Sticky != 0 => 't',
+                Self::UExec | Self::GExec | Self::OExec => 'x',
+            }
+        } else {
+            '-'
+        }
+    }
+}
+
 /// Functions for extracting information about Unix modes
 pub trait Mode {
     /// Returns a string representing permissions in symbolic format
@@ -73,6 +110,50 @@ impl Mode for u32 {
     }
 }
 
+impl BitAnd<u32> for Bit {
+    type Output = u32;
+
+    fn bitand(self, rhs: u32) -> Self::Output {
+        self as u32 & rhs
+    }
+}
+
+impl BitAnd<Bit> for u32 {
+    type Output = u32;
+
+    fn bitand(self, rhs: Bit) -> Self::Output {
+        self & rhs as u32
+    }
+}
+
+impl BitAndAssign<Bit> for u32 {
+    fn bitand_assign(&mut self, rhs: Bit) {
+        *self = *self & rhs;
+    }
+}
+
+impl BitOr<u32> for Bit {
+    type Output = u32;
+
+    fn bitor(self, rhs: u32) -> Self::Output {
+        self as u32 | rhs
+    }
+}
+
+impl BitOr<Bit> for u32 {
+    type Output = u32;
+
+    fn bitor(self, rhs: Bit) -> Self::Output {
+        self | rhs as u32
+    }
+}
+
+impl BitOrAssign<Bit> for u32 {
+    fn bitor_assign(&mut self, rhs: Bit) {
+        *self = *self | rhs;
+    }
+}
+
 #[cfg(test)]
 mod test {
     use super::*;

src/mode/parser.rs

@@ -1,9 +1,9 @@
-use crate::bitflags::BitFlags;
+use super::{get_umask, Bit};
-use super::{get_umask, Bit, Who};
 use std::{
     error,
     fmt::Display,
     num::ParseIntError,
+    ops::{BitAnd, BitAndAssign, BitOr, BitOrAssign},
 };
 
 /// Errors which might occur when parsing Unix permissions from a string
@@ -46,6 +46,45 @@ enum Op {
     Equals,
 }
 
+#[derive(PartialEq)]
+/// The granularity of the given permissions
+enum Who {
+    /// applies for the current user
+    User = 0o100,
+    /// applies for the current group
+    Group = 0o10,
+    /// applies for everyone else
+    Other = 0o1,
+}
+
+impl BitAnd<Who> for u32 {
+    type Output = u32;
+
+    fn bitand(self, rhs: Who) -> Self::Output {
+        self & rhs as u32
+    }
+}
+
+impl BitAndAssign<Who> for u32 {
+    fn bitand_assign(&mut self, rhs: Who) {
+        *self = *self & rhs;
+    }
+}
+
+impl BitOr<Who> for u32 {
+    type Output = u32;
+
+    fn bitor(self, rhs: Who) -> Self::Output {
+        self | rhs as u32
+    }
+}
+
+impl BitOrAssign<Who> for u32 {
+    fn bitor_assign(&mut self, rhs: Who) {
+        *self = *self | rhs;
+    }
+}
+
 /// A parser for octal and symbolic permissions. `Parser::default` creates an
 /// instance which applies the given operations to the default setting for the
 /// current user's umask. `Parser::new` creates a parser which applies the given
@@ -118,13 +157,13 @@ impl Parser {
         if self.op.is_none() {
             Err(ParseError::NoOpSet)
         } else {
-            if self.who.contains(Who::User) {
+            if self.who & 0o100 != 0 {
                 self.bits |= Bit::URead;
             }
-            if self.who.contains(Who::Group) {
+            if self.who & 0o10 != 0 {
                 self.bits |= Bit::GRead;
             }
-            if self.who.contains(Who::Other) {
+            if self.who & 0o1 != 0 {
                 self.bits |= Bit::ORead;
             }
             Ok(())
@@ -135,13 +174,13 @@ impl Parser {
         if self.op.is_none() {
             Err(ParseError::NoOpSet)
         } else {
-            if self.who.contains(Who::User) {
+            if self.who & 0o100 != 0 {
                 self.bits |= Bit::UWrite;
             }
-            if self.who.contains(Who::Group) {
+            if self.who & 0o10 != 0 {
                 self.bits |= Bit::GWrite;
             }
-            if self.who.contains(Who::Other) {
+            if self.who & 0o1 != 0 {
                 self.bits |= Bit::OWrite;
             }
             Ok(())
@@ -152,13 +191,13 @@ impl Parser {
         if self.op.is_none() {
             Err(ParseError::NoOpSet)
         } else {
-            if self.who.contains(Who::User) {
+            if self.who & 0o100 != 0 {
                 self.bits |= Bit::UExec;
             }
-            if self.who.contains(Who::Group) {
+            if self.who & 0o10 != 0 {
                 self.bits |= Bit::GExec;
             }
-            if self.who.contains(Who::Other) {
+            if self.who & 0o1 != 0 {
                 self.bits |= Bit::OExec;
             }
             Ok(())
@@ -166,27 +205,27 @@ impl Parser {
     }
 
     fn push_suid_sgid(&mut self) -> Result<(), ParseError> {
-        if self.who == 0 || self.who.contains(Who::Other) {
+        if self.who == 0 || self.who & 0o1 != 0 {
             return Err(ParseError::InvalidBit);
         } else if self.op.is_none() {
             return Err(ParseError::NoOpSet);
         }
-        if self.who.contains(Who::User) {
+        if self.who & 0o100 != 0 {
             self.bits |= Bit::Suid;
         }
-        if self.who.contains(Who::Group) {
+        if self.who & 0o10 != 0 {
             self.bits |= Bit::Sgid;
         }
         Ok(())
     }
 
     fn push_sticky(&mut self) -> Result<(), ParseError> {
-        if self.who == 0 || self.who.contains(Who::User) || self.who.contains(Who::Group) {
+        if self.who == 0 || self.who & 0o100 != 0 || self.who & 0o10 != 0 {
             return Err(ParseError::InvalidBit);
         } else if self.op.is_none() {
             return Err(ParseError::NoOpSet);
         }
-        if self.who.contains(Who::Other) {
+        if self.who & 0o1 != 0 {
             self.bits |= Bit::Sticky;
         }
         Ok(())
@@ -205,13 +244,13 @@ impl Parser {
             Some(Op::Add) => self.add_bits(),
             Some(Op::Remove) => self.remove_bits(),
             Some(Op::Equals) => {
-                if self.who.contains(Who::User) {
+                if self.who & 0o100 != 0 {
                     self.mode &= !(0o4700);
                 }
-                if self.who.contains(Who::Group) {
+                if self.who & 0o10 != 0 {
                     self.mode &= !(0o2070);
                 }
-                if self.who.contains(Who::Other) {
+                if self.who & 0o1 != 0 {
                     self.mode &= !(0o1007);
                 }
                 self.add_bits();

src/mode/who.rs

@@ -1,49 +0,0 @@
-use std::ops::{BitAnd, BitAndAssign, BitOr, BitOrAssign};
-
-#[derive(PartialEq)]
-/// The granularity of the given permissions
-pub enum Who {
-    /// applies for the current user
-    User = 0o100,
-    /// applies for the current group
-    Group = 0o10,
-    /// applies for everyone else
-    Other = 0o1,
-}
-
-impl BitAnd<Who> for u32 {
-    type Output = u32;
-
-    fn bitand(self, rhs: Who) -> Self::Output {
-        self & rhs as u32
-    }
-}
-
-impl BitAnd<u32> for Who {
-    type Output = u32;
-
-    fn bitand(self, rhs: u32) -> Self::Output {
-        self as u32 & rhs
-    }
-}
-
-impl BitAndAssign<Who> for u32 {
-    fn bitand_assign(&mut self, rhs: Who) {
-        *self = *self & rhs;
-    }
-}
-
-impl BitOr<Who> for u32 {
-    type Output = u32;
-
-    fn bitor(self, rhs: Who) -> Self::Output {
-        self | rhs as u32
-    }
-}
-
-impl BitOrAssign<Who> for u32 {
-    fn bitor_assign(&mut self, rhs: Who) {
-        *self = *self | rhs;
-    }
-}
-