From 632fcb5b7790984e0258703e51ef56d12a232d10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Sch=C3=B6nauer?= <37108907+DottoDev@users.noreply.github.com> Date: Thu, 3 Nov 2022 17:05:09 +0000 Subject: [PATCH] Changes version requirements to latest path of minor version (#127) --- Cargo.lock | 68 ++++++++++++++++++++++++++++++++------------------- Cargo.toml | 62 +++++++++++++++++++++++----------------------- src/config.rs | 11 +++++---- 3 files changed, 80 insertions(+), 61 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8c7754bb..2c86ccfb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -225,16 +225,16 @@ dependencies = [ [[package]] name = "clap" -version = "3.2.22" +version = "3.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86447ad904c7fb335a790c9d7fe3d0d971dc523b8ccd1561a520de9a85302750" +checksum = "d2dbdf4bdacb33466e854ce889eee8dfd5729abf7ccd7664d0a2d60cd384440b" dependencies = [ "atty", "bitflags", "clap_derive", "clap_lex", "indexmap", - "once_cell", + "lazy_static", "strsim", "termcolor", "textwrap", @@ -242,9 +242,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "3.2.18" +version = "3.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65" +checksum = "25320346e922cffe59c0bbc5410c8d8784509efb321488971081313cb1e1a33c" dependencies = [ "heck 0.4.0", "proc-macro-error", @@ -660,9 +660,9 @@ checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" [[package]] name = "h2" -version = "0.3.15" +version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f9f29bc9dda355256b2916cf526ab02ce0aeaaaf2bad60d65ef3f12f11dd0f4" +checksum = "62eeb471aa3e3c9197aa4bfeabfe02982f6dc96f750486c0bb0009ac58b26d2b" dependencies = [ "bytes", "fnv", @@ -985,14 +985,24 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.5" +version = "0.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de" +checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc" dependencies = [ "libc", "log", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys", + "miow", + "ntapi", + "winapi", +] + +[[package]] +name = "miow" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" +dependencies = [ + "winapi", ] [[package]] @@ -1034,6 +1044,15 @@ dependencies = [ "zvariant_derive", ] +[[package]] +name = "ntapi" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f" +dependencies = [ + "winapi", +] + [[package]] name = "num-integer" version = "0.1.45" @@ -1358,9 +1377,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.6.0" +version = "1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" +checksum = "d83f127d94bdbcda4c8cc2e50f6f84f4b611f69c902699ca385a39c3a75f9ff1" dependencies = [ "aho-corasick", "memchr", @@ -1761,13 +1780,13 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.3.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" +checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22" dependencies = [ "cfg-if", - "fastrand", "libc", + "rand", "redox_syscall", "remove_dir_all", "winapi", @@ -1875,9 +1894,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.21.2" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9e03c497dc955702ba729190dc4aac6f2a0ce97f913e5b1b5912fc5039d9099" +checksum = "cd3b82e6e823a9ee7d7f64b08f8ac3d5f08ac988f23157194bd32af3f2f92767" dependencies = [ "autocfg", "bytes", @@ -1885,9 +1904,9 @@ dependencies = [ "memchr", "mio", "num_cpus", + "once_cell", "pin-project-lite", "signal-hook-registry", - "socket2", "winapi", ] @@ -1904,16 +1923,16 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.4" +version = "0.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740" +checksum = "9e99e1983e5d376cd8eb4b66604d2e99e79f5bd988c3055891dcd8c9e2604cc0" dependencies = [ "bytes", "futures-core", "futures-sink", + "log", "pin-project-lite", "tokio", - "tracing", ] [[package]] @@ -2217,13 +2236,12 @@ dependencies = [ [[package]] name = "which" -version = "4.3.0" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c831fbbee9e129a8cf93e7747a82da9d95ba8e16621cae60ec2cdc849bacb7b" +checksum = "b55551e42cbdf2ce2bedd2203d0cc08dba002c27510f86dab6d0ce304cba3dfe" dependencies = [ "either", "libc", - "once_cell", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index c609ba6b..adff3ba6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,44 +20,44 @@ path = "src/main.rs" ##name = "topgrade_lib" [dependencies] -home = "0.5" -directories = "4.0" -serde = { version = "1.0", features = ["derive"] } +home = "~0.5" +directories = "~4.0" +serde = { version = "~1.0", features = ["derive"] } toml = "0.5" -which_crate = { version = "4.1", package = "which" } -shellexpand = "2.1" -clap = { version = "3.1", features = ["cargo", "derive"] } -log = "0.4" -walkdir = "2.3" -console = "0.15" -lazy_static = "1.4" -chrono = "0.4" -pretty_env_logger = "0.4" -glob = "0.3" -strum = { version = "0.24", features = ["derive"] } -thiserror = "1.0" -anyhow = "1.0" -tempfile = "3.2" -cfg-if = "1.0" -tokio = { version = "1.5", features = ["process", "rt-multi-thread"] } -futures = "0.3" -regex = "1.5" -sys-info = "0.9" -semver = "1.0" -shell-words = "1.1.0" +which_crate = { version = "~4.1", package = "which" } +shellexpand = "~2.1" +clap = { version = "~3.1", features = ["cargo", "derive"] } +log = "~0.4" +walkdir = "~2.3" +console = "~0.15" +lazy_static = "~1.4" +chrono = "~0.4" +pretty_env_logger = "~0.4" +glob = "~0.3" +strum = { version = "~0.24", features = ["derive"] } +thiserror = "~1.0" +anyhow = "~1.0" +tempfile = "~3.2" +cfg-if = "~1.0" +tokio = { version = "~1.5", features = ["process", "rt-multi-thread"] } +futures = "~0.3" +regex = "~1.5" +sys-info = "~0.9" +semver = "~1.0" +shell-words = "~1.1" [target.'cfg(target_os = "macos")'.dependencies] -notify-rust = "4.5" +notify-rust = "~4.5" [target.'cfg(unix)'.dependencies] -nix = "0.24" -rust-ini = "0.18" -self_update_crate = { version = "0.30", default-features = false, optional = true, package = "self_update", features = ["archive-tar", "compression-flate2", "rustls"] } +nix = "~0.24" +rust-ini = "~0.18" +self_update_crate = { version = "~0.30", default-features = false, optional = true, package = "self_update", features = ["archive-tar", "compression-flate2", "rustls"] } [target.'cfg(windows)'.dependencies] -self_update_crate = { version = "0.30", default-features = false, optional = true, package = "self_update", features = ["archive-zip", "compression-zip-deflate", "rustls"] } -winapi = "0.3" -parselnk = "0.1" +self_update_crate = { version = "~0.30", default-features = false, optional = true, package = "self_update", features = ["archive-zip", "compression-zip-deflate", "rustls"] } +winapi = "~0.3" +parselnk = "~0.1" [profile.release] lto = true diff --git a/src/config.rs b/src/config.rs index f9fa06d0..10727019 100644 --- a/src/config.rs +++ b/src/config.rs @@ -1,15 +1,16 @@ #![allow(dead_code)] -use std::collections::BTreeMap; -use std::fs::write; -use std::path::PathBuf; -use std::process::Command; -use std::{env, fs}; +use anyhow::Context; use anyhow::Result; use clap::{ArgEnum, Parser}; use directories::BaseDirs; use log::debug; use regex::Regex; use serde::Deserialize; +use std::collections::BTreeMap; +use std::fs::write; +use std::path::PathBuf; +use std::process::Command; +use std::{env, fs}; use strum::{EnumIter, EnumString, EnumVariantNames, IntoEnumIterator}; use sys_info::hostname; use which_crate::which;