Adapt to fs_extra 1.2.0
This commit is contained in:
parent
b9fb595db2
commit
9ba69a7381
|
@ -1247,9 +1247,9 @@ dependencies = [
|
||||||
|
|
||||||
[[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"
|
||||||
|
|
|
@ -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"
|
||||||
|
|
|
@ -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"
|
||||||
|
|
|
@ -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.6.0" }
|
solana-config-program = { path = "../programs/config", version = "1.6.0" }
|
||||||
|
|
|
@ -787,9 +787,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"
|
||||||
|
|
|
@ -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"
|
||||||
|
|
|
@ -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, ©_options)
|
fs_extra::move_items(&[&append_vec_abs_path], &local_dir, ©_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(()))
|
||||||
})?;
|
})?;
|
||||||
|
|
Loading…
Reference in New Issue