lostecho/ncspot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cargo clippy

Browse Source
This commit is contained in:
Henrik Friedrichsen
2021-07-11 01:38:57 +02:00
parent 46a8f01bac
commit 9eb99cc8be
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/command.rs
View File

@@ -338,7 +338,10 @@ pub fn parse(input: &str) -> Option<Command> {
Some(Command::Repeat(mode))
}
"seek" => args.get(0).and_then(|arg| match arg.chars().next() {
Some(x) if x == '-' || x == '+' => String::from_iter(arg.chars().skip(1))
Some(x) if x == '-' || x == '+' => arg
.chars()
.skip(1)
.collect::<String>()
.parse::<i32>()
.ok()
.map(|amount| {
@@ -350,7 +353,9 @@ pub fn parse(input: &str) -> Option<Command> {
},
))
}),
_ => String::from_iter(arg.chars())
_ => arg
.chars()
.collect::<String>()
.parse()
.ok()
.map(|amount| Command::Seek(SeekDirection::Absolute(amount))),

9
src/main.rs
View File

@@ -257,22 +257,21 @@ async fn main() {
let mut main = s.find_name::<ui::layout::Layout>("main").unwrap();
main.clear_cmdline();
}
let cmd_without_prefix = &cmd[1..];
if cmd.strip_prefix('/').is_some() {
let query = &cmd[1..];
let command = Command::Jump(JumpMode::Query(query.to_string()));
let command = Command::Jump(JumpMode::Query(cmd_without_prefix.to_string()));
if let Some(data) = s.user_data::<UserData>().cloned() {
data.cmd.handle(s, command);
}
} else {
let c = &cmd[1..];
let parsed = command::parse(c);
let parsed = command::parse(cmd_without_prefix);
if let Some(parsed) = parsed {
if let Some(data) = s.user_data::<UserData>().cloned() {
data.cmd.handle(s, parsed)
}
} else {
let mut main = s.find_name::<ui::layout::Layout>("main").unwrap();
let err_msg = format!("Unknown command: \"{}\"", c);
let err_msg = format!("Unknown command: \"{}\"", cmd_without_prefix);
main.set_result(Err(err_msg));
}
}