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

Update to cursive 0.16

Browse Source
This commit is contained in:
Alexandre Bury
2021-01-19 10:44:29 -08:00
committed by Henrik Friedrichsen
parent 0abfab84bc
commit cfb91493a5
5 changed files with 63 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

168
Cargo.lock generated
View File

@@ -62,20 +62,13 @@ dependencies = [
[[package]]
name = "ahash"
version = "0.3.8"
version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e8fd72866655d1904d6b0997d0b07ba561047d070fbe29de039031c641b61217"
checksum = "796540673305a66d127804eef19ad696f1f204b8c1025aaca4958c17eab32877"
dependencies = [
"const-random",
]
[[package]]
name = "ahash"
version = "0.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e"
dependencies = [
"const-random",
"getrandom 0.2.2",
"once_cell",
"version_check",
]
[[package]]
@@ -451,28 +444,6 @@ dependencies = [
"bitflags 1.2.1",
]
[[package]]
name = "const-random"
version = "0.1.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f590d95d011aa80b063ffe3253422ed5aa462af4e9867d43ce8337562bac77c4"
dependencies = [
"const-random-macro",
"proc-macro-hack",
]
[[package]]
name = "const-random-macro"
version = "0.1.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "615f6e27d000a2bffbc7f2f6a8669179378fa27ee4d0a509e985dfc0a7defb40"
dependencies = [
"getrandom 0.2.1",
"lazy_static",
"proc-macro-hack",
"tiny-keccak",
]
[[package]]
name = "constant_time_eq"
version = "0.1.5"
@@ -575,16 +546,6 @@ dependencies = [
"cfg-if 1.0.0",
]
[[package]]
name = "crossbeam-channel"
version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87"
dependencies = [
"crossbeam-utils 0.7.2",
"maybe-uninit",
]
[[package]]
name = "crossbeam-channel"
version = "0.5.0"
@@ -654,12 +615,6 @@ dependencies = [
"lazy_static",
]
[[package]]
name = "crunchy"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
[[package]]
name = "crypto-mac"
version = "0.7.0"
@@ -682,15 +637,14 @@ dependencies = [
[[package]]
name = "cursive"
version = "0.15.0"
version = "0.16.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a9f12332ab2bca26979ef00cfef9a1c2e287db03b787a83d892ad9961f81374"
checksum = "6593c3409eb794bf22090bec60dda1e19d1def284478bec7e5a92da3cf977c52"
dependencies = [
"ahash 0.3.8",
"cfg-if 0.1.10",
"crossbeam-channel 0.4.4",
"ahash",
"cfg-if 1.0.0",
"crossbeam-channel",
"cursive_core",
"enumset",
"lazy_static",
"libc",
"log 0.4.13",
@@ -701,27 +655,28 @@ dependencies = [
"termion",
"unicode-segmentation",
"unicode-width",
"wasmer_enumset",
]
[[package]]
name = "cursive_core"
version = "0.1.1"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "85fc5b6a8ba2f1bc743892068bde466438f78d6247197e2dc094bfd53fdea4b7"
checksum = "025ac0bcd21ced752d27b70e6aa2285a3513d07b5a0c7f89e71121d20ca1429d"
dependencies = [
"ahash 0.4.7",
"ahash",
"chrono",
"crossbeam-channel 0.4.4",
"crossbeam-channel",
"enum-map",
"enumset",
"lazy_static",
"libc",
"log 0.4.13",
"num",
"owning_ref",
"signal-hook",
"syn 1.0.57",
"unicode-segmentation",
"unicode-width",
"wasmer_enumset",
"xi-unicode",
]
@@ -933,28 +888,6 @@ dependencies = [
"syn 1.0.57",
]
[[package]]
name = "enumset"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "959a80a2062fedd66ed41d99736212de987b3a8c83a4c2cef243968075256bd1"
dependencies = [
"enumset_derive",
"num-traits",
]
[[package]]
name = "enumset_derive"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "74bef436ac71820c5cf768d7af9ba33121246b09a00e09a55d94ef8095a875ac"
dependencies = [
"darling 0.10.2",
"proc-macro2 1.0.24",
"quote 1.0.8",
"syn 1.0.57",
]
[[package]]
name = "env_logger"
version = "0.6.2"
@@ -1213,9 +1146,9 @@ dependencies = [
[[package]]
name = "getrandom"
version = "0.2.1"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4060f4657be78b8e766215b02b18a2e862d83745545de804638e2b545e81aee6"
checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8"
dependencies = [
"cfg-if 1.0.0",
"libc",
@@ -1289,9 +1222,9 @@ dependencies = [
[[package]]
name = "hermit-abi"
version = "0.1.17"
version = "0.1.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8"
checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c"
dependencies = [
"libc",
]
@@ -1624,9 +1557,9 @@ dependencies = [
[[package]]
name = "libloading"
version = "0.6.6"
version = "0.6.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e9367bdfa836b7e3cf895867f7a570283444da90562980ec2263d6e1569b16bc"
checksum = "351a32417a12d5f7e82c368a66781e307834dae04c6ce0cd4456d52989229883"
dependencies = [
"cfg-if 1.0.0",
"winapi 0.3.9",
@@ -1958,7 +1891,7 @@ dependencies = [
"chrono",
"clap",
"clipboard",
"crossbeam-channel 0.5.0",
"crossbeam-channel",
"cursive",
"dbus",
"dbus-tree",
@@ -2446,9 +2379,9 @@ checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
[[package]]
name = "proc-macro-nested"
version = "0.1.6"
version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eba180dafb9038b050a4c280019bbedf9f2467b61e5d892dcad585bb57aadc5a"
checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086"
[[package]]
name = "proc-macro2"
@@ -2676,7 +2609,7 @@ version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c026d7df8b298d90ccbbc5190bd04d85e159eaf5576caeacf8741da93ccbd2e5"
dependencies = [
"getrandom 0.2.1",
"getrandom 0.2.2",
]
[[package]]
@@ -2797,11 +2730,11 @@ dependencies = [
[[package]]
name = "redox_termios"
version = "0.1.1"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76"
checksum = "8440d8acb4fd3d277125b4bd01a6f38aee8d814b3b5fc09b3f2b825d37d3fe8f"
dependencies = [
"redox_syscall 0.1.57",
"redox_syscall 0.2.4",
]
[[package]]
@@ -2821,7 +2754,7 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64"
dependencies = [
"getrandom 0.2.1",
"getrandom 0.2.2",
"redox_syscall 0.2.4",
]
@@ -3182,9 +3115,9 @@ checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2"
[[package]]
name = "signal-hook"
version = "0.1.17"
version = "0.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7e31d442c16f047a671b5a71e2161d6e68814012b7f5379d269ebd915fac2729"
checksum = "780f5e3fe0c66f67197236097d89de1e86216f1f6fdeaf47c442f854ab46c240"
dependencies = [
"libc",
"signal-hook-registry",
@@ -3478,15 +3411,6 @@ dependencies = [
"winapi 0.3.9",
]
[[package]]
name = "tiny-keccak"
version = "2.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237"
dependencies = [
"crunchy",
]
[[package]]
name = "tinyvec"
version = "1.1.0"
@@ -4104,6 +4028,28 @@ version = "0.2.69"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7e7811dd7f9398f14cc76efd356f98f03aa30419dea46aa810d71e819fc97158"
[[package]]
name = "wasmer_enumset"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf088cc1f7d247fd96dff0df46fb1bbb747d8a69ae1ecd71aed55c55e354b2d8"
dependencies = [
"num-traits",
"wasmer_enumset_derive",
]
[[package]]
name = "wasmer_enumset_derive"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a8d1b32d98e11194200baf6d3f85eb2d6cfe56f6d9af0dd617f90ca48f958a88"
dependencies = [
"darling 0.10.2",
"proc-macro2 1.0.24",
"quote 1.0.8",
"syn 1.0.57",
]
[[package]]
name = "web-sys"
version = "0.3.46"
@@ -4254,9 +4200,9 @@ dependencies = [
[[package]]
name = "xi-unicode"
version = "0.2.1"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e71b85d8b1b8bfaf4b5c834187554d201a8cd621c2bbfa33efd41a3ecabd48b2"
checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a"
[[package]]
name = "xml-rs"

2
Cargo.toml
View File

@@ -49,7 +49,7 @@ regex = "1"
syn = "=1.0.57"
[dependencies.cursive]
version = "0.15"
version = "0.16.3"
default-features = false
[features]

3
src/main.rs
View File

@@ -43,7 +43,6 @@ use std::sync::Arc;
use clap::{App, Arg};
use cursive::traits::Identifiable;
use cursive::{Cursive, CursiveExt};
use std::ffi::CString;
use librespot_core::authentication::Credentials;
@@ -215,7 +214,7 @@ fn main() {
credentials = credentials_prompt(reset, Some(error_msg));
}
let mut cursive = Cursive::default();
let mut cursive = cursive::default().into_runner();
let theme = cfg.build_theme();
cursive.set_theme(theme.clone());

2
src/ui/layout.rs
View File

@@ -42,7 +42,7 @@ impl Layout {
Layout {
screens: HashMap::new(),
stack: HashMap::new(),
statusbar: status.as_boxed_view(),
statusbar: status.into_boxed_view(),
focus: None,
cmdline: EditView::new().filler(" ").style(style),
cmdline_focus: false,

6
src/ui/search.rs
View File

@@ -3,7 +3,7 @@
use cursive::direction::Orientation;
use cursive::event::{AnyCb, Event, EventResult, Key};
use cursive::traits::{Boxable, Finder, Identifiable, View};
use cursive::view::{IntoBoxedView, Selector, ViewWrapper};
use cursive::view::{IntoBoxedView, Selector, ViewNotFound, ViewWrapper};
use cursive::views::{EditView, NamedView, ViewRef};
use cursive::{Cursive, Printer, Vec2};
use std::cell::RefCell;
@@ -96,12 +96,12 @@ impl View for SearchView {
self.edit.call_on_any(selector, &mut |v| callback(v));
}
fn focus_view(&mut self, selector: &Selector<'_>) -> Result<(), ()> {
fn focus_view(&mut self, selector: &Selector<'_>) -> Result<(), ViewNotFound> {
if let Selector::Name(s) = selector {
self.edit_focused = s == &"search_edit";
Ok(())
} else {
Err(())
Err(ViewNotFound)
}
}
}