diff --git a/Cargo.lock b/Cargo.lock index 7c511e9..cfd79d5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -424,9 +424,9 @@ dependencies = [ [[package]] name = "fs4" -version = "0.8.3" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73969b81e8bc90a3828d913dd3973d80771bfb9d7fbe1a78a79122aad456af15" +checksum = "e8c6b3bd49c37d2aa3f3f2220233b29a7cd23f79d1fe70e5337d25fb390793de" dependencies = [ "rustix", "windows-sys 0.52.0", @@ -913,9 +913,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "openssl" -version = "0.10.64" +version = "0.10.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" +checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" dependencies = [ "bitflags", "cfg-if", @@ -945,9 +945,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.102" +version = "0.9.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" +checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" dependencies = [ "cc", "libc", @@ -1500,7 +1500,6 @@ dependencies = [ "fs4", "indicatif", "itertools", - "once_cell", "rand", "reqwest", "semver", diff --git a/Cargo.toml b/Cargo.toml index b2e215e..072267e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,7 +5,7 @@ resolver = "2" [workspace.package] version = "0.5.4" edition = "2021" -rust-version = "1.70" +rust-version = "1.80" authors = [ "Rohit Narurkar ", "Matthias Seitz ", diff --git a/clippy.toml b/clippy.toml index 5d37e5d..8bfc90f 100644 --- a/clippy.toml +++ b/clippy.toml @@ -1 +1 @@ -msrv = "1.70" +msrv = "1.80" diff --git a/crates/svm-rs/Cargo.toml b/crates/svm-rs/Cargo.toml index e2ae551..fc71caa 100644 --- a/crates/svm-rs/Cargo.toml +++ b/crates/svm-rs/Cargo.toml @@ -24,17 +24,12 @@ path = "src/bin/solc/main.rs" required-features = ["solc"] [build-dependencies] -vergen = { version = "8", optional = true, features = [ - "build", - "git", - "gitcl", -] } +vergen = { version = "8", optional = true, features = ["build", "git", "gitcl"] } [dependencies] -fs4 = "0.8" +fs4 = "0.9" hex.workspace = true dirs = "5.0" -once_cell = "1.17" reqwest = { workspace = true, default-features = false, features = ["json"] } semver = { workspace = true, features = ["serde"] } serde = { workspace = true, features = ["derive"] } @@ -50,10 +45,7 @@ console = { version = "0.15", default-features = false, optional = true } dialoguer = { version = "0.11", default-features = false, optional = true } indicatif = { version = "0.17", default-features = false, optional = true } itertools = { version = "0.13", optional = true } -tokio = { version = "1", features = [ - "rt-multi-thread", - "macros", -], optional = true } +tokio = { version = "1", features = ["rt-multi-thread", "macros"], optional = true } [target.'cfg(all(target_os = "windows", target_arch = "x86_64"))'.dependencies] zip = { version = "2", default-features = false, features = ["deflate"] } diff --git a/crates/svm-rs/src/install.rs b/crates/svm-rs/src/install.rs index ced56a9..ca4fcb4 100644 --- a/crates/svm-rs/src/install.rs +++ b/crates/svm-rs/src/install.rs @@ -115,7 +115,7 @@ fn do_install(version: &Version, binbytes: &[u8], _artifact: &str) -> Result Result { - use fs4::FileExt; + use fs4::fs_std::FileExt; let _lock_file = fs::OpenOptions::new() .create(true) .truncate(true) diff --git a/crates/svm-rs/src/releases.rs b/crates/svm-rs/src/releases.rs index 5e7b030..90fc829 100644 --- a/crates/svm-rs/src/releases.rs +++ b/crates/svm-rs/src/releases.rs @@ -1,9 +1,8 @@ use crate::{error::SvmError, platform::Platform}; -use once_cell::sync::Lazy; use reqwest::get; use semver::Version; use serde::{Deserialize, Serialize}; -use std::collections::BTreeMap; +use std::{collections::BTreeMap, sync::LazyLock}; use url::Url; // Updating new releases: @@ -24,7 +23,7 @@ const OLD_VERSION_MAX: Version = Version::new(0, 4, 9); const OLD_VERSION_MIN: Version = Version::new(0, 4, 0); -static OLD_SOLC_RELEASES: Lazy = Lazy::new(|| { +static OLD_SOLC_RELEASES: LazyLock = LazyLock::new(|| { serde_json::from_str(include_str!("../list/linux-arm64-old.json")) .expect("could not parse list linux-arm64-old.json") });