~zethra/poki-launcher

1877cd98a9bfb9569cb38785c94dd2173041870b — Ben Aaron Goldberg 3 days ago 3ea1305
all: update deps major versions and fixes errors w new version

rust-ini was not updated as I'm going to replace in it with
freedesktop_entry_parser.
M Cargo.lock => Cargo.lock +23 -48
@@ 227,31 227,20 @@ dependencies = [

[[package]]
name = "cstr"
version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "19f7a08ed4ecd7e077d4cee63937473e6f7cf57b702a9114ef41751b2cbc0f60"
dependencies = [
 "cstr-macros",
 "procedural-masquerade",
]

[[package]]
name = "cstr-macros"
version = "0.1.6"
version = "0.2.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cd670e5ff58768ef624207fb95709ce63b8d05573fb9a05165f0eef471ea6a3a"
checksum = "c11a39d776a3b35896711da8a04dc1835169dcd36f710878187637314e47941b"
dependencies = [
 "procedural-masquerade",
 "syn",
 "proc-macro2",
 "quote",
]

[[package]]
name = "directories"
version = "2.0.2"
version = "3.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "551a778172a450d7fc12e629ca3b0428d00f6afa9a43da1b630d54604e97371c"
checksum = "f8fed639d60b58d0f53498ab13d26f621fd77569cc6edb031f4cc36a2ad9da0f"
dependencies = [
 "cfg-if 0.1.10",
 "dirs-sys",
]



@@ 295,9 284,9 @@ checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"

[[package]]
name = "env_logger"
version = "0.7.1"
version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36"
checksum = "17392a012ea30ef05a610aa97dfb49496e71c9f676b27879922ea5bdf60d9d3f"
dependencies = [
 "atty",
 "humantime",


@@ 462,12 451,9 @@ dependencies = [

[[package]]
name = "humantime"
version = "1.3.0"
version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f"
dependencies = [
 "quick-error",
]
checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"

[[package]]
name = "if_rust_version"


@@ 506,9 492,9 @@ dependencies = [

[[package]]
name = "itertools"
version = "0.8.2"
version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f56a2d0bc861f9165be4eb3442afd3c236d8a98afd426f65d92324ae1091a484"
checksum = "37d572918e350e82412fe766d24b15e6682fb2ed2bbe018280caa810397cb319"
dependencies = [
 "either",
]


@@ 566,11 552,10 @@ dependencies = [
 "itertools",
 "lazy_static",
 "log",
 "nix 0.17.0",
 "nix 0.20.0",
 "rmp-serde",
 "rust-ini",
 "serde 1.0.123",
 "serde_derive",
 "shellexpand",
 "thiserror",
 "uuid 0.8.2",


@@ 716,15 701,14 @@ dependencies = [

[[package]]
name = "nix"
version = "0.17.0"
version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "50e4785f2c3b7589a0d0c1dd60285e1188adac4006e8abd6dd578e1567027363"
checksum = "fa9b4819da1bc61c0ea48b63b7bc8604064dd43013e7cc325df098d49cd7c18a"
dependencies = [
 "bitflags",
 "cc",
 "cfg-if 0.1.10",
 "cfg-if 1.0.0",
 "libc",
 "void",
]

[[package]]


@@ 819,7 803,7 @@ dependencies = [
 "lib-poki-launcher",
 "libc",
 "log",
 "nix 0.17.0",
 "nix 0.20.0",
 "notify",
 "poki-launcher-notifier",
 "qmetaobject",


@@ 835,7 819,7 @@ version = "0.1.0"
dependencies = [
 "anyhow",
 "libc",
 "nix 0.17.0",
 "nix 0.20.0",
 "signal-hook",
]



@@ 873,12 857,6 @@ dependencies = [
]

[[package]]
name = "procedural-masquerade"
version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f1383dff4092fe903ac180e391a8d4121cc48f08ccf850614b0290c6673b69d"

[[package]]
name = "qmetaobject"
version = "0.1.4"
source = "git+https://github.com/zethra/qmetaobject-rs.git?rev=8bd0121#8bd0121db97898a0fb3a97d00763740219e2b985"


@@ 900,12 878,6 @@ dependencies = [
]

[[package]]
name = "quick-error"
version = "1.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"

[[package]]
name = "quote"
version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"


@@ 1027,9 999,9 @@ dependencies = [

[[package]]
name = "rmp-serde"
version = "0.14.4"
version = "0.15.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ce7d70c926fe472aed493b902010bccc17fa9f7284145cb8772fd22fdb052d8"
checksum = "839395ef53057db96b84c9238ab29e1a13f2e5c8ec9f66bef853ab4197303924"
dependencies = [
 "byteorder",
 "rmp",


@@ 1107,6 1079,9 @@ name = "serde"
version = "1.0.123"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "92d5161132722baa40d802cc70b15262b98258453e85e5d1d365c757c73869ae"
dependencies = [
 "serde_derive",
]

[[package]]
name = "serde-hjson"

M lib-poki-launcher/Cargo.toml => lib-poki-launcher/Cargo.toml +18 -9
@@ 30,17 30,26 @@ edition = "2018"
thiserror = "1.0"
anyhow = "1.0"
log = "0.4"
serde = "1.0"
serde_derive = "1.0"
rust-ini = "0.14"
rmp-serde = "0.14"
rmp-serde = "0.15"
fuzzy-matcher = "0.3"
uuid = { version = "0.8", features = ["serde", "v4"] }
config = { version = "0.10", default-features = false, features = ["hjson"] }
directories = "2.0"
directories = "3.0"
lazy_static = "1.4"
nix = "0.17"
nix = "0.20"
shellexpand = "2.0"
itertools = "0.8"
itertools = "0.10"
walkdir = "2.3"
file-lock = "1.1"
\ No newline at end of file
file-lock = "1.1"

[dependencies.config]
version = "0.10"
default-features = false
features = ["hjson"] 

[dependencies.uuid]
version = "0.8"
features = ["serde", "v4"]

[dependencies.serde]
version = "1.0"
features = ["derive"]

M lib-poki-launcher/src/config.rs => lib-poki-launcher/src/config.rs +1 -1
@@ 16,7 16,7 @@
 */
use crate::DIRS;
use anyhow::Error;
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use std::default::Default;
use std::fs::create_dir;


M lib-poki-launcher/src/db.rs => lib-poki-launcher/src/db.rs +5 -3
@@ 22,9 22,10 @@ use super::App;
use crate::config::Config;
use anyhow::Error;
use file_lock::FileLock;
use fuzzy_matcher::skim::fuzzy_match;
use fuzzy_matcher::skim::SkimMatcherV2;
use fuzzy_matcher::FuzzyMatcher;
use rmp_serde as rmp;
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use std::fs::File;
use std::io::Write as _;
use std::path::Path;


@@ 128,10 129,11 @@ impl AppsDB {
        search: &str,
        num_items: Option<usize>,
    ) -> Vec<App> {
        let matcher = SkimMatcherV2::default();
        let mut app_list = self
            .apps
            .iter()
            .filter_map(|app| match fuzzy_match(&app.name, &search) {
            .filter_map(|app| match matcher.fuzzy_match(&app.name, &search) {
                Some(score) if score > 0 => {
                    let mut app = app.clone();
                    app.score += score as f32;

M lib-poki-launcher/src/lib.rs => lib-poki-launcher/src/lib.rs +1 -1
@@ 27,7 27,7 @@ pub mod scan;

use directories::{BaseDirs, ProjectDirs};
use lazy_static::lazy_static;
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use std::cmp::{Eq, Ord, Ordering, PartialEq, PartialOrd};
use std::fmt;
use std::path::PathBuf;

M poki-krunner/Cargo.toml => poki-krunner/Cargo.toml +1 -1
@@ 9,5 9,5 @@ edition = "2018"
[dependencies]
lib-poki-launcher = { version = "0.3.0", path = "../lib-poki-launcher" }
log = "0.4"
env_logger = "0.7"
env_logger = "0.8"
anyhow = "1.0"

M poki-launcher-notifier/Cargo.toml => poki-launcher-notifier/Cargo.toml +2 -2
@@ 31,5 31,5 @@ edition = "2018"
[dependencies]
signal-hook = "0.1"
libc = "0.2"
nix = "0.17"
anyhow = "1.0"
\ No newline at end of file
nix = "0.20"
anyhow = "1.0"

M poki-launcher/Cargo.toml => poki-launcher/Cargo.toml +4 -4
@@ 28,19 28,19 @@ edition = "2018"

[dependencies]
libc = "0.2"
nix = "0.17"
nix = "0.20"
lib-poki-launcher = { version = "0.3.0", path = "../lib-poki-launcher" }
poki-launcher-notifier = { version = "0.1.0", path = "../poki-launcher-notifier" }
structopt = "0.3"
rmp-serde = "0.14"
rmp-serde = "0.15"
serde_json = "1.0"
lazy_static = "1.4"
log = "0.4"
env_logger = "0.7"
env_logger = "0.8"
anyhow = "1.0"
human-panic = "1.0"
qmetaobject = { git = "https://github.com/zethra/qmetaobject-rs.git", rev = "8bd0121"}
cstr = "0.1"
cstr = "0.2"
cpp = "0.5"
notify = "4.0"
shellexpand = "2.0"