From 723c03dfbdeb1f652c675f3d2801d64a7268bc71 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Wed, 17 Feb 2021 22:07:12 +0000
Subject: [PATCH] Adapt to fs_extra 1.2.0 (#15380)

(cherry picked from commit 9ba69a73814e310de855c63805e3e45edd46b671)

Co-authored-by: Michael Vines <mvines@gmail.com>
---
 Cargo.lock                    | 4 ++--
 core/Cargo.toml               | 2 +-
 ledger/Cargo.toml             | 2 +-
 local-cluster/Cargo.toml      | 2 +-
 programs/bpf/Cargo.lock       | 4 ++--
 runtime/Cargo.toml            | 2 +-
 runtime/src/serde_snapshot.rs | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d1e9e382be..d3401fa6d9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1188,9 +1188,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 
 [[package]]
 name = "fs_extra"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f2a4a2034423744d2cc7ca2068453168dcdb82c438419e639a26bd87839c674"
+checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394"
 
 [[package]]
 name = "fuchsia-cprng"
diff --git a/core/Cargo.toml b/core/Cargo.toml
index 7304ee525a..aa572d1782 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -24,7 +24,7 @@ chrono = { version = "0.4.11", features = ["serde"] }
 core_affinity = "0.5.10"
 crossbeam-channel = "0.4"
 ed25519-dalek = "=1.0.0-pre.4"
-fs_extra = "1.1.0"
+fs_extra = "1.2.0"
 flate2 = "1.0"
 indexmap = { version = "1.5", features = ["rayon"] }
 itertools = "0.9.0"
diff --git a/ledger/Cargo.toml b/ledger/Cargo.toml
index e4734824f7..01791b4a28 100644
--- a/ledger/Cargo.toml
+++ b/ledger/Cargo.toml
@@ -17,7 +17,7 @@ crossbeam-channel = "0.4"
 dlopen_derive = "0.1.4"
 dlopen = "0.1.8"
 ed25519-dalek = "1.0.0-pre.4"
-fs_extra = "1.1.0"
+fs_extra = "1.2.0"
 futures = "0.3.8"
 futures-util = "0.3.5"
 itertools = "0.9.0"
diff --git a/local-cluster/Cargo.toml b/local-cluster/Cargo.toml
index b8316f2f8e..8c0f2ee147 100644
--- a/local-cluster/Cargo.toml
+++ b/local-cluster/Cargo.toml
@@ -12,7 +12,7 @@ homepage = "https://solana.com/"
 crossbeam-channel = "0.4"
 itertools = "0.9.0"
 gag = "0.1.10"
-fs_extra = "1.1.0"
+fs_extra = "1.2.0"
 log = "0.4.11"
 rand = "0.7.0"
 solana-config-program = { path = "../programs/config", version = "1.5.9" }
diff --git a/programs/bpf/Cargo.lock b/programs/bpf/Cargo.lock
index 1d82d62010..040c9099da 100644
--- a/programs/bpf/Cargo.lock
+++ b/programs/bpf/Cargo.lock
@@ -803,9 +803,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 
 [[package]]
 name = "fs_extra"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f2a4a2034423744d2cc7ca2068453168dcdb82c438419e639a26bd87839c674"
+checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394"
 
 [[package]]
 name = "fuchsia-zircon"
diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml
index c3ea482600..557809eccd 100644
--- a/runtime/Cargo.toml
+++ b/runtime/Cargo.toml
@@ -19,7 +19,7 @@ crossbeam-channel = "0.4"
 dir-diff = "0.3.2"
 flate2 = "1.0.14"
 fnv = "1.0.7"
-fs_extra = "1.1.0"
+fs_extra = "1.2.0"
 itertools = "0.9.0"
 lazy_static = "1.4.0"
 libc = "0.2.81"
diff --git a/runtime/src/serde_snapshot.rs b/runtime/src/serde_snapshot.rs
index 9955bd1adf..799959feb2 100644
--- a/runtime/src/serde_snapshot.rs
+++ b/runtime/src/serde_snapshot.rs
@@ -322,7 +322,7 @@ where
                 std::fs::rename(append_vec_abs_path.clone(), target).or_else(|_| {
                     let mut copy_options = CopyOptions::new();
                     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))
                         .and(Ok(()))
                 })?;