From 9eb99cc8be19f58299ef8eafdb0424c9ebc53b2e Mon Sep 17 00:00:00 2001
From: Henrik Friedrichsen <henrik@affekt.org>
Date: Sun, 11 Jul 2021 01:38:57 +0200
Subject: [PATCH] cargo clippy

---
 src/command.rs | 9 +++++++--
 src/main.rs    | 9 ++++-----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/command.rs b/src/command.rs
index 3a7547b..a1d884d 100644
--- a/src/command.rs
+++ b/src/command.rs
@@ -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))),
diff --git a/src/main.rs b/src/main.rs
index 84ec762..1331c12 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -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));
                 }
             }