From 6fd2ba5715a874d54c9261877ed761168d7955d9 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Fri, 26 Jan 2024 17:23:53 -0500
Subject: [PATCH] v1.18: Removes fs-err dependency (backport of #34911)
 (#34923)

Removes fs-err dependency (#34911)

(cherry picked from commit 3303c2566c4257410d073fe22d98fa4598248ec0)

Co-authored-by: Brooks <brooks@solana.com>
---
 Cargo.lock              | 10 ----------
 Cargo.toml              |  1 -
 programs/sbf/Cargo.lock | 10 ----------
 runtime/Cargo.toml      |  1 -
 4 files changed, 22 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d6660b388a906b..8c58206d5f091c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2028,15 +2028,6 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa"
 
-[[package]]
-name = "fs-err"
-version = "2.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88a41f105fe1d5b6b34b2055e3dc59bb79b46b48b2040b9e6c7b4b5de097aa41"
-dependencies = [
- "autocfg",
-]
-
 [[package]]
 name = "fs_extra"
 version = "1.3.0"
@@ -7033,7 +7024,6 @@ dependencies = [
  "ed25519-dalek",
  "flate2",
  "fnv",
- "fs-err",
  "im",
  "index_list",
  "itertools",
diff --git a/Cargo.toml b/Cargo.toml
index 3da03d9963ff91..b4782eed20070d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -201,7 +201,6 @@ fast-math = "0.1"
 fd-lock = "3.0.13"
 flate2 = "1.0.28"
 fnv = "1.0.7"
-fs-err = "2.11.0"
 fs_extra = "1.3.0"
 futures = "0.3.30"
 futures-util = "0.3.29"
diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock
index ce9a056e6467d7..781d1215ff1cf2 100644
--- a/programs/sbf/Cargo.lock
+++ b/programs/sbf/Cargo.lock
@@ -1732,15 +1732,6 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa"
 
-[[package]]
-name = "fs-err"
-version = "2.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88a41f105fe1d5b6b34b2055e3dc59bb79b46b48b2040b9e6c7b4b5de097aa41"
-dependencies = [
- "autocfg",
-]
-
 [[package]]
 name = "fs_extra"
 version = "1.3.0"
@@ -5738,7 +5729,6 @@ dependencies = [
  "dir-diff",
  "flate2",
  "fnv",
- "fs-err",
  "im",
  "index_list",
  "itertools",
diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml
index 774ac8664c89a2..355c858597895f 100644
--- a/runtime/Cargo.toml
+++ b/runtime/Cargo.toml
@@ -24,7 +24,6 @@ dashmap = { workspace = true, features = ["rayon", "raw-api"] }
 dir-diff = { workspace = true }
 flate2 = { workspace = true }
 fnv = { workspace = true }
-fs-err = { workspace = true }
 im = { workspace = true, features = ["rayon", "serde"] }
 index_list = { workspace = true }
 itertools = { workspace = true }