From 41951e22a48faf93c52eb3979ff8fd4b73de35a2 Mon Sep 17 00:00:00 2001 From: Austin Jones Date: Thu, 12 Mar 2020 14:13:12 -0400 Subject: [PATCH 1/2] Fix crash when user enters a command that doesn't exist --- src/cmds/core.rs | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/cmds/core.rs b/src/cmds/core.rs index fe0208f..8356d46 100644 --- a/src/cmds/core.rs +++ b/src/cmds/core.rs @@ -42,13 +42,18 @@ fn extract_from_selections(raw_output: &str, contains_key: bool) -> (&str, &str, } else { "enter" }; - let mut parts = lines.next().unwrap().split(display::DELIMITER); + + let mut parts = lines.next() + .unwrap() + .split(display::DELIMITER); parts.next(); parts.next(); parts.next(); - let tags = parts.next().unwrap(); + + let tags = parts.next().unwrap_or(""); parts.next(); - let snippet = parts.next().unwrap(); + + let snippet = parts.next().unwrap_or(""); (key, tags, snippet) } From 0f8b9853b696d6e34ba1a9248a35d1b874bddebe Mon Sep 17 00:00:00 2001 From: Denis Isidoro Date: Thu, 12 Mar 2020 17:42:56 -0300 Subject: [PATCH 2/2] Bump --- Cargo.lock | 2 +- Cargo.toml | 2 +- src/cmds/core.rs | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4372aee..1874236 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -89,7 +89,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "navi" -version = "2.0.5" +version = "2.0.7" dependencies = [ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "raw_tty 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/Cargo.toml b/Cargo.toml index 2e076d3..5be37a1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "navi" -version = "2.0.5" +version = "2.0.7" authors = ["Denis Isidoro "] edition = "2018" diff --git a/src/cmds/core.rs b/src/cmds/core.rs index 8356d46..e659b6b 100644 --- a/src/cmds/core.rs +++ b/src/cmds/core.rs @@ -43,9 +43,7 @@ fn extract_from_selections(raw_output: &str, contains_key: bool) -> (&str, &str, "enter" }; - let mut parts = lines.next() - .unwrap() - .split(display::DELIMITER); + let mut parts = lines.next().unwrap().split(display::DELIMITER); parts.next(); parts.next(); parts.next();