lslocks: Small code cleanup

This commit is contained in:
alxndrv
2025-02-21 18:20:53 +02:00
parent 9dd6bc1391
commit ee14c44540
2 changed files with 7 additions and 10 deletions
Cargo.toml
src/uu/lslocks/src

@ -39,9 +39,6 @@ feat_common_core = [
"setsid", "setsid",
] ]
[workspace]
members = ["src/uu/lslocks"]
[workspace.dependencies] [workspace.dependencies]
clap = { version = "4.4", features = ["wrap_help", "cargo"] } clap = { version = "4.4", features = ["wrap_help", "cargo"] }
clap_complete = "4.4" clap_complete = "4.4"

@ -33,7 +33,7 @@ impl Lock {
Column::Type => self.lock_type.to_string(), Column::Type => self.lock_type.to_string(),
Column::Size => todo!(), Column::Size => todo!(),
Column::Inode => self.inode.to_string(), Column::Inode => self.inode.to_string(),
Column::MajMin => self.major_minor.clone(), Column::MajorMinor => self.major_minor.clone(),
Column::Mode => self.mode.to_string(), Column::Mode => self.mode.to_string(),
Column::Mandatory => { Column::Mandatory => {
if self.mandatory { if self.mandatory {
@ -94,10 +94,10 @@ impl FromStr for Lock {
}; };
// This field has a format of MAJOR:MINOR:INODE // This field has a format of MAJOR:MINOR:INODE
let maj_min_inode: Vec<_> = parts.next().unwrap().split(":").collect(); let major_minor_inode: Vec<_> = parts.next().unwrap().split(":").collect();
assert_eq!(maj_min_inode.len(), 3); assert_eq!(major_minor_inode.len(), 3);
let major_minor = [maj_min_inode[0], maj_min_inode[1]].join(":"); let major_minor = [major_minor_inode[0], major_minor_inode[1]].join(":");
let inode = maj_min_inode[2].parse::<usize>().unwrap(); let inode = major_minor_inode[2].parse::<usize>().unwrap();
let start_offset = parts.next().unwrap().parse::<usize>().unwrap(); let start_offset = parts.next().unwrap().parse::<usize>().unwrap();
let end_offset: Option<usize> = parts.next().and_then(|offset_str| match offset_str { let end_offset: Option<usize> = parts.next().and_then(|offset_str| match offset_str {
@ -184,7 +184,7 @@ enum Column {
Type, Type,
Size, Size,
Inode, Inode,
MajMin, MajorMinor,
Mode, Mode,
Mandatory, Mandatory,
Start, Start,
@ -202,7 +202,7 @@ impl Column {
Self::Type => "TYPE", Self::Type => "TYPE",
Self::Size => "SIZE", Self::Size => "SIZE",
Self::Inode => "INODE", Self::Inode => "INODE",
Self::MajMin => "MAJ:MIN", Self::MajorMinor => "MAJ:MIN",
Self::Mode => "MODE", Self::Mode => "MODE",
Self::Mandatory => "M", Self::Mandatory => "M",
Self::Start => "START", Self::Start => "START",