Fix rustc 1.50 compatibility

pull/201/head v0.12.1
Arijit Basu 3 years ago committed by Arijit Basu
parent b4247a7d03
commit 88aedddf53

2
Cargo.lock generated

@ -1108,7 +1108,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
[[package]]
name = "xplr"
version = "0.12.0"
version = "0.12.1"
dependencies = [
"ansi-to-tui",
"anyhow",

@ -1,6 +1,6 @@
[package]
name = "xplr"
version = "0.12.0" # Update lua.rs
version = "0.12.1" # Update lua.rs
authors = ["Arijit Basu <sayanarijit@gmail.com>"]
edition = "2018"
description = "A hackable, minimal, fast TUI file explorer"

@ -134,9 +134,10 @@ mod test {
fn test_compatibility() {
assert!(check_version(VERSION, "foo path").is_ok());
assert!(check_version("0.12.0", "foo path").is_ok());
assert!(check_version("0.12.1", "foo path").is_ok());
assert!(check_version("0.12.1", "foo path").is_err());
assert!(check_version("0.10.0", "foo path").is_err());
assert!(check_version("0.12.2", "foo path").is_err());
assert!(check_version("0.11.0", "foo path").is_err());
assert!(check_version("1.12.0", "foo path").is_err());
}
}

@ -475,8 +475,9 @@ fn draw_table<B: Backend>(
})
.unwrap_or_default();
let (mimetype, mimesub) =
node.mime_essence().split_once("/").unwrap_or_default();
let mut me = node.mime_essence().splitn(2, '/');
let mimetype: String = me.next().map(|s| s.into()).unwrap_or_default();
let mimesub: String = me.next().map(|s| s.into()).unwrap_or_default();
let node_type = app_config
.node_types()
@ -487,8 +488,8 @@ fn draw_table<B: Backend>(
app_config
.node_types()
.mime_essence()
.get(mimetype)
.and_then(|t| t.get(mimesub).or_else(|| t.get("*")))
.get(&mimetype)
.and_then(|t| t.get(&mimesub).or_else(|| t.get("*")))
})
.unwrap_or_else(|| {
if node.is_symlink() {

Loading…
Cancel
Save