clippy: Fix several clippy issues

In order to enable several clippy lint groups fix several findings.
This commit is contained in:
finga 2023-10-14 12:29:14 +02:00
parent 74090abdb6
commit e1cac4e164
10 changed files with 97 additions and 105 deletions

View file

@ -22,17 +22,13 @@ pub struct Create {
}
fn msgsize_default() -> usize {
match fs::read_to_string("/proc/sys/fs/mqueue/msgsize_default") {
Ok(m) => m.trim().parse::<usize>().expect("can never fail"),
_ => 8192,
}
fs::read_to_string("/proc/sys/fs/mqueue/msgsize_default")
.map_or(8192, |m| m.trim().parse::<usize>().expect("can never fail"))
}
fn msg_default() -> usize {
match fs::read_to_string("/proc/sys/fs/mqueue/msg_default") {
Ok(m) => m.trim().parse::<usize>().expect("can never fail"),
_ => 10,
}
fs::read_to_string("/proc/sys/fs/mqueue/msg_default")
.map_or(10, |m| m.trim().parse::<usize>().expect("can never fail"))
}
impl Create {

View file

@ -14,12 +14,13 @@ pub struct List {
impl List {
pub fn run(&self) -> Result<()> {
match self.all {
false => println!("Name"),
true => println!(
if self.all {
println!(
"{0: <10} {1: <10} {2: <12} {3: <26} {4: <26}",
"Name", "Size", "Permissions", "Modified", "Accessed",
),
);
} else {
println!("Name");
}
for mq in fs::read_dir("/dev/mqueue")? {

View file

@ -36,7 +36,7 @@ fn print_message(priority: u32, length: usize, timestamp: bool, msg: &str) {
println!("{}", Local::now());
}
println!("{}", msg);
println!("{msg}");
}
impl Recv {

View file

@ -3,7 +3,8 @@ use clap::Parser;
use log::info;
use sysvmq::SysvMq;
/// Create a SysV message queue
#[allow(clippy::doc_markdown)]
/// Create a SysV IPC message queue
#[derive(Debug, Parser)]
pub struct Create {
/// Permissions (octal) to create the queue with (default: 0644)

View file

@ -17,8 +17,8 @@ pub struct Info {
}
fn print_line(line: &str) {
for field in line.split_whitespace().collect::<Vec<&str>>() {
print!("{0: <10}", field);
for field in line.split_whitespace() {
print!("{field: <10}");
}
println!();

View file

@ -10,10 +10,11 @@ use std::{
pub struct List {}
impl List {
#[allow(clippy::unused_self)]
pub fn run(&self) -> Result<()> {
for line in BufReader::new(File::open("/proc/sysvipc/msg")?).lines() {
for field in line?.split_whitespace().collect::<Vec<&str>>() {
print!("{0: <10}", field);
for field in line?.split_whitespace() {
print!("{field: <10}");
}
println!();