mirror of
https://github.com/Zedfrigg/ironbar.git
synced 2025-07-01 10:41:03 +02:00
refactor: fix a few new clippy warnings
This commit is contained in:
parent
9d09855fce
commit
e63509a3a7
3 changed files with 9 additions and 10 deletions
|
@ -59,8 +59,8 @@ impl ClipboardClient {
|
|||
let iter = senders.iter();
|
||||
for (tx, sender_cache_size) in iter {
|
||||
if cache_size == *sender_cache_size {
|
||||
let mut cache = lock!(cache);
|
||||
let removed_id = cache
|
||||
// let mut cache = lock!(cache);
|
||||
let removed_id = lock!(cache)
|
||||
.remove_ref_first()
|
||||
.expect("Clipboard cache unexpectedly empty");
|
||||
try_send!(tx, ClipboardEvent::Remove(removed_id));
|
||||
|
@ -131,8 +131,7 @@ impl ClipboardClient {
|
|||
}
|
||||
|
||||
pub fn remove(&self, id: usize) {
|
||||
let mut cache = lock!(self.cache);
|
||||
cache.remove(id);
|
||||
lock!(self.cache).remove(id);
|
||||
|
||||
let senders = lock!(self.senders);
|
||||
let iter = senders.iter();
|
||||
|
|
|
@ -60,10 +60,10 @@ async fn main() -> Result<()> {
|
|||
|display| display,
|
||||
);
|
||||
|
||||
let config_res = match env::var("IRONBAR_CONFIG") {
|
||||
Ok(path) => ConfigLoader::load(path),
|
||||
Err(_) => ConfigLoader::new("ironbar").find_and_load(),
|
||||
};
|
||||
let config_res = env::var("IRONBAR_CONFIG").map_or_else(
|
||||
|_| ConfigLoader::new("ironbar").find_and_load(),
|
||||
ConfigLoader::load,
|
||||
);
|
||||
|
||||
let config = match config_res {
|
||||
Ok(config) => config,
|
||||
|
|
|
@ -229,7 +229,7 @@ impl Script {
|
|||
let mut args_list = vec!["-c", &self.cmd];
|
||||
|
||||
if let Some(args) = args {
|
||||
args_list.extend(args.iter().map(|s| s.as_str()));
|
||||
args_list.extend(args.iter().map(String::as_str));
|
||||
}
|
||||
|
||||
debug!("Running sh with args: {args_list:?}");
|
||||
|
@ -322,7 +322,7 @@ impl Script {
|
|||
///
|
||||
pub fn run_as_oneshot(&self, args: Option<&[String]>) {
|
||||
let script = self.clone();
|
||||
let args = args.map(|args| args.to_vec());
|
||||
let args = args.map(<[String]>::to_vec);
|
||||
|
||||
spawn(async move {
|
||||
match script.get_output(args.as_deref()).await {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue