Clippy adjustments

This commit is contained in:
Arne Beer 2020-05-14 14:57:59 +02:00
parent e8f80973a8
commit 5b1cc6eecd
4 changed files with 10 additions and 13 deletions

View file

@ -57,15 +57,12 @@ async fn main() -> Result<()> {
// Some special command handling.
// Simple log output follows for local logs don't need any communication with the daemon.
// Thereby we handle this separately over here.
match &message {
Message::StreamRequest(message) => {
if settings.client.read_local_logs {
let pueue_directory = settings.daemon.pueue_directory.clone();
follow_task_logs(pueue_directory, message.task_id, message.err);
return Ok(());
}
if let Message::StreamRequest(message) = &message {
if settings.client.read_local_logs {
let pueue_directory = settings.daemon.pueue_directory.clone();
follow_task_logs(pueue_directory, message.task_id, message.err);
return Ok(());
}
_ => (),
}
let mut client = Client::new(settings, message, opt)?;

View file

@ -33,7 +33,7 @@ pub fn get_message_from_opt(opt: &Opt, settings: &Settings) -> Result<Message> {
Ok(Message::Add(AddMessage {
command: command.join(" "),
path: cwd.to_string(),
envs: envs,
envs,
start_immediately: *start_immediately,
stashed: *stashed,
group: group.clone(),
@ -144,7 +144,7 @@ pub fn get_message_from_opt(opt: &Opt, settings: &Settings) -> Result<Message> {
task_id: *task_id,
err: *err,
};
return Ok(Message::StreamRequest(message));
Ok(Message::StreamRequest(message))
}
SubCommand::Clean => Ok(Message::Clean),
SubCommand::Reset => Ok(Message::Reset),

View file

@ -16,7 +16,7 @@ pub fn has_special_columns(tasks: &BTreeMap<usize, Task>) -> (bool, bool) {
.iter()
.any(|(_id, task)| !task.dependencies.is_empty());
return (has_delayed_tasks, has_dependencies);
(has_delayed_tasks, has_dependencies)
}
/// Return a nicely formatted headline that's displayed at the start of `pueue status`
@ -37,7 +37,7 @@ pub fn get_default_headline(state: &State) -> String {
}
/// Return a nicely formatted headline that's displayed above group tables
pub fn get_group_headline(group: &String, state: &State) -> String {
pub fn get_group_headline(group: &str, state: &State) -> String {
// Group name
let group_text = style(format!("Group \"{}\"", group)).attribute(Attribute::Bold);

View file

@ -103,7 +103,7 @@ impl State {
self.running = status;
let keys = self.groups.keys().cloned().collect::<Vec<String>>();
for key in keys {
self.groups.insert(key.into(), status);
self.groups.insert(key, status);
}
self.save()
}