From 9820c5c3dd0cdc40163927494c1e82aee79bb927 Mon Sep 17 00:00:00 2001 From: Johan Andersson Date: Sat, 17 Oct 2020 13:08:59 +0200 Subject: [PATCH] Replace unmaintained directories crate Fixes RUSTSEC-2020-0054 warning from cargo-audit/cargo-deny, follows the recommendation to switch to the new maintained `directories-next` crate fork Only affects the cache directory determination for the environment and was a simple search'n'replace to this fork so don't think behavior has changed. https://rustsec.org/advisories/RUSTSEC-2020-0054 --- Cargo.lock | 71 +++++++++++++++++++++++--------------- crates/cache/Cargo.toml | 2 +- crates/cache/src/config.rs | 2 +- 3 files changed, 46 insertions(+), 29 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7709f83295..1333da68d6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -105,7 +105,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "46254cf2fdcdf1badb5934448c1bcbe046a56537b3987d96c51a7afc5d03f293" dependencies = [ "addr2line", - "cfg-if", + "cfg-if 0.1.10", "libc", "miniz_oxide", "object 0.20.0", @@ -259,6 +259,12 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + [[package]] name = "chrono" version = "0.4.13" @@ -549,7 +555,7 @@ version = "0.66.0" dependencies = [ "anyhow", "capstone", - "cfg-if", + "cfg-if 0.1.10", "cranelift", "cranelift-codegen", "cranelift-entity", @@ -602,7 +608,7 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", ] [[package]] @@ -623,7 +629,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" dependencies = [ "autocfg 1.0.0", - "cfg-if", + "cfg-if 0.1.10", "crossbeam-utils", "lazy_static", "maybe-uninit", @@ -637,7 +643,7 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "crossbeam-utils", "maybe-uninit", ] @@ -649,7 +655,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" dependencies = [ "autocfg 1.0.0", - "cfg-if", + "cfg-if 0.1.10", "lazy_static", ] @@ -659,7 +665,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34ac344c7efccb80cd25bc61b2170aec26f2f693fd40e765a539a1243db48c71" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", ] [[package]] @@ -711,13 +717,13 @@ dependencies = [ ] [[package]] -name = "directories" -version = "2.0.2" +name = "directories-next" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "551a778172a450d7fc12e629ca3b0428d00f6afa9a43da1b630d54604e97371c" +checksum = "e99a2917b211508b8c64dac237f316bc4d71b4b818521f4ee60ab38d1ea28081" dependencies = [ - "cfg-if", - "dirs-sys", + "cfg-if 1.0.0", + "dirs-sys-next", ] [[package]] @@ -726,7 +732,7 @@ version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "dirs-sys", ] @@ -741,6 +747,17 @@ dependencies = [ "winapi", ] +[[package]] +name = "dirs-sys-next" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99de365f605554ae33f115102a02057d4fc18b01f3284d6870be0938743cfe7d" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + [[package]] name = "dynasm" version = "0.5.2" @@ -862,7 +879,7 @@ version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "affc17579b132fc2461adf7c575cc6e8b134ebca52c51f5411388965227dc695" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "libc", "redox_syscall", "winapi", @@ -907,7 +924,7 @@ version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "libc", "wasi", ] @@ -1115,7 +1132,7 @@ version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", ] [[package]] @@ -2023,7 +2040,7 @@ version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "libc", "rand 0.7.3", "redox_syscall", @@ -2074,7 +2091,7 @@ name = "test-programs" version = "0.19.0" dependencies = [ "anyhow", - "cfg-if", + "cfg-if 0.1.10", "os_pipe", "pretty_env_logger", "target-lexicon", @@ -2148,7 +2165,7 @@ version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d79ca061b032d6ce30c660fded31189ca0b9922bf483cd70759f13a2d86786c" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "log", "tracing-attributes", "tracing-core", @@ -2306,7 +2323,7 @@ name = "wasi-common" version = "0.20.0" dependencies = [ "anyhow", - "cfg-if", + "cfg-if 0.1.10", "cpu-time", "filetime", "getrandom", @@ -2360,7 +2377,7 @@ dependencies = [ "anyhow", "backtrace", "bincode", - "cfg-if", + "cfg-if 0.1.10", "lazy_static", "libc", "log", @@ -2410,7 +2427,7 @@ dependencies = [ "anyhow", "base64 0.12.3", "bincode", - "directories", + "directories-next", "errno", "file-per-thread-logger", "filetime", @@ -2492,7 +2509,7 @@ name = "wasmtime-environ" version = "0.20.0" dependencies = [ "anyhow", - "cfg-if", + "cfg-if 0.1.10", "cranelift-codegen", "cranelift-entity", "cranelift-wasm", @@ -2542,7 +2559,7 @@ name = "wasmtime-jit" version = "0.20.0" dependencies = [ "anyhow", - "cfg-if", + "cfg-if 0.1.10", "cranelift-codegen", "cranelift-entity", "cranelift-frontend", @@ -2595,7 +2612,7 @@ name = "wasmtime-profiling" version = "0.20.0" dependencies = [ "anyhow", - "cfg-if", + "cfg-if 0.1.10", "gimli", "ittapi-rs", "lazy_static", @@ -2614,7 +2631,7 @@ version = "0.20.0" dependencies = [ "backtrace", "cc", - "cfg-if", + "cfg-if 0.1.10", "indexmap", "lazy_static", "libc", @@ -2833,7 +2850,7 @@ name = "yanix" version = "0.20.0" dependencies = [ "bitflags", - "cfg-if", + "cfg-if 0.1.10", "filetime", "libc", "tracing", diff --git a/crates/cache/Cargo.toml b/crates/cache/Cargo.toml index 0213281ecd..cc3798857a 100644 --- a/crates/cache/Cargo.toml +++ b/crates/cache/Cargo.toml @@ -12,7 +12,7 @@ edition = "2018" anyhow = "1.0" base64 = "0.12.0" bincode = "1.1.4" -directories = "2.0.1" +directories-next = "1.0" file-per-thread-logger = "0.1.1" log = { version = "0.4.8", default-features = false } serde = { version = "1.0.94", features = ["derive"] } diff --git a/crates/cache/src/config.rs b/crates/cache/src/config.rs index ca4d7bd921..1e58082edf 100644 --- a/crates/cache/src/config.rs +++ b/crates/cache/src/config.rs @@ -2,7 +2,7 @@ use super::Worker; use anyhow::{anyhow, bail, Context, Result}; -use directories::ProjectDirs; +use directories_next::ProjectDirs; use log::{trace, warn}; use serde::{ de::{self, Deserializer},