gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Adapt to fs_extra 1.2.0 (#15380)

Browse Source 
(cherry picked from commit 9ba69a7381)

Co-authored-by: Michael Vines <mvines@gmail.com>
This commit is contained in:
mergify[bot]
2021-02-17 22:07:12 +00:00
committed by GitHub
parent 0a1fcfa08b
commit 723c03dfbd
7 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.lock generated
View File

@ -1188,9 +1188,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
[[package]] [[package]]
name = "fs_extra" name = "fs_extra"
version = "1.1.0" version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5f2a4a2034423744d2cc7ca2068453168dcdb82c438419e639a26bd87839c674" checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394"
[[package]] [[package]]
name = "fuchsia-cprng" name = "fuchsia-cprng"

2
core/Cargo.toml
View File

@ -24,7 +24,7 @@ chrono = { version = "0.4.11", features = ["serde"] }
core_affinity = "0.5.10" core_affinity = "0.5.10"
crossbeam-channel = "0.4" crossbeam-channel = "0.4"
ed25519-dalek = "=1.0.0-pre.4" ed25519-dalek = "=1.0.0-pre.4"
fs_extra = "1.1.0" fs_extra = "1.2.0"
flate2 = "1.0" flate2 = "1.0"
indexmap = { version = "1.5", features = ["rayon"] } indexmap = { version = "1.5", features = ["rayon"] }
itertools = "0.9.0" itertools = "0.9.0"

2
ledger/Cargo.toml
View File

@ -17,7 +17,7 @@ crossbeam-channel = "0.4"
dlopen_derive = "0.1.4" dlopen_derive = "0.1.4"
dlopen = "0.1.8" dlopen = "0.1.8"
ed25519-dalek = "1.0.0-pre.4" ed25519-dalek = "1.0.0-pre.4"
fs_extra = "1.1.0" fs_extra = "1.2.0"
futures = "0.3.8" futures = "0.3.8"
futures-util = "0.3.5" futures-util = "0.3.5"
itertools = "0.9.0" itertools = "0.9.0"

2
local-cluster/Cargo.toml
View File

@ -12,7 +12,7 @@ homepage = "https://solana.com/"
crossbeam-channel = "0.4" crossbeam-channel = "0.4"
itertools = "0.9.0" itertools = "0.9.0"
gag = "0.1.10" gag = "0.1.10"
fs_extra = "1.1.0" fs_extra = "1.2.0"
log = "0.4.11" log = "0.4.11"
rand = "0.7.0" rand = "0.7.0"
solana-config-program = { path = "../programs/config", version = "1.5.9" } solana-config-program = { path = "../programs/config", version = "1.5.9" }

4
programs/bpf/Cargo.lock generated
View File

@ -803,9 +803,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
[[package]] [[package]]
name = "fs_extra" name = "fs_extra"
version = "1.1.0" version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5f2a4a2034423744d2cc7ca2068453168dcdb82c438419e639a26bd87839c674" checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394"
[[package]] [[package]]
name = "fuchsia-zircon" name = "fuchsia-zircon"

2
runtime/Cargo.toml
View File

@ -19,7 +19,7 @@ crossbeam-channel = "0.4"
dir-diff = "0.3.2" dir-diff = "0.3.2"
flate2 = "1.0.14" flate2 = "1.0.14"
fnv = "1.0.7" fnv = "1.0.7"
fs_extra = "1.1.0" fs_extra = "1.2.0"
itertools = "0.9.0" itertools = "0.9.0"
lazy_static = "1.4.0" lazy_static = "1.4.0"
libc = "0.2.81" libc = "0.2.81"

2
runtime/src/serde_snapshot.rs
View File

@ -322,7 +322,7 @@ where
std::fs::rename(append_vec_abs_path.clone(), target).or_else(|_| { std::fs::rename(append_vec_abs_path.clone(), target).or_else(|_| {
let mut copy_options = CopyOptions::new(); let mut copy_options = CopyOptions::new();
copy_options.overwrite = true; copy_options.overwrite = true;
fs_extra::move_items(&vec![&append_vec_abs_path], &local_dir, &copy_options) fs_extra::move_items(&[&append_vec_abs_path], &local_dir, &copy_options)
.map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e)) .map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e))
.and(Ok(())) .and(Ok(()))
})?; })?;