Merging debian version 1.65.0+dfsg1-2.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

14 files changed, 171 insertions, 109 deletions

diff --git a/vendor/fs-err/.cargo-checksum.json b/vendor/fs-err/.cargo-checksum.json
index 96f6899da..0cafc2bae 100644
--- a/vendor/fs-err/.cargo-checksum.json
+++ b/vendor/fs-err/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"CHANGELOG.md":"8b53bca7b646d3afd45cde66ce850b263218904ecdd66f47e5684ef04ec873b8","Cargo.toml":"03bb23a8e71f90f8e7e5c6120f97f22b3319b2be1adb751a5f6b312fa62c9a18","LICENSE-APACHE":"7cfd738c53d61c79f07e348f622bf7707c9084237054d37fbe07788a75f5881c","LICENSE-MIT":"36516aefdc84c5d5a1e7485425913a22dbda69eb1930c5e84d6ae4972b5194b9","README.md":"e5c3355cb080a50bade0664df1f853e3f041121a9aa5bda2074ce6e01e210437","README.tpl":"de2f4fa16d473b928004aed4e11bd70522690961c6e34094a07fc68e9a092426","src/dir.rs":"1fbc8a3ada7e5e8a8c15dc0bf0e3c94cbeeea26e4a5f2b411c62d93adc023ebb","src/errors.rs":"263370df16fb2fc2c77c7b434da301792c61841960855dc11ba99523a324a2f3","src/file.rs":"dccdbd8f2b2e4e7c167df555f3a1facbf8003292c081d842711a852f2cf4b471","src/lib.rs":"f3e2041ef73f15b88594d93370b53e8f08717f7ce142184ec0c40e42d7b73c91","src/open_options.rs":"3ea24a370732eff1da0fae2205f251d3171d4e5e03f4c38508a2114942a16466","src/os.rs":"54fe6cb71a24592de1cb4e1fcebdeaba5e58b26925dbf2dc868e8dd0b0a7bef7","src/os/unix.rs":"3e2940651ce8d7b624d10bb9f3e64334812e1bb0476d12dfec130dcb1b16fe7e","src/os/windows.rs":"6dc3099f9e48a386cba9f58599796583f0cb3c8b7123168f8d1c8e27fd8763e3","src/path.rs":"949dff5847ef0983ede9e9eec1fa0f3e6d8ffd1a35004249ad04a2d2700eb85b","tests/version-numbers.rs":"370467b40ce930d655389ba82015ae2842b3361bf24280c3dc7214d3ac163a2d"},"package":"bcd1163ae48bda72a20ae26d66a04d3094135cadab911cff418ae5e33f253431"}
\ No newline at end of file
+{"files":{"CHANGELOG.md":"fb2609e5837d71e923def1765b6addc4d11b0b5040e7eb9bdbf50d59a4a5cd42","Cargo.toml":"b468e8d560ea6e30277c2ee438ac650bbb2397f5b62da911126c180921aa5d29","LICENSE-APACHE":"7cfd738c53d61c79f07e348f622bf7707c9084237054d37fbe07788a75f5881c","LICENSE-MIT":"36516aefdc84c5d5a1e7485425913a22dbda69eb1930c5e84d6ae4972b5194b9","README.md":"adbf428f33a04028cc8db98d7b75bdcf28d0edb5e792867578bcb93f1784abec","src/dir.rs":"c5255382d7357f2fbcb0b45325a343277d347f0dd0b5f0e5ff74cb808020795d","src/errors.rs":"f04771790f55627fdc39de43a1d16f7d0125bbf48d4a1c8a70921f2670dd3eaa","src/file.rs":"4516834bc52f1219f10e369bf570fd432493ceaf5d52d239d93a5e69ceaed0aa","src/lib.rs":"1a10c04bde2bc3ae30cc328afb0aa00ac98ab80c6bfff5ae94ee7e5bdbe86ec8","src/open_options.rs":"304c5be36b5a6c5ecc2c731e2956627494945d093952c879d8f3c5b15216b1d0","src/os.rs":"54fe6cb71a24592de1cb4e1fcebdeaba5e58b26925dbf2dc868e8dd0b0a7bef7","src/os/unix.rs":"21ab862305b9e1034c41bb4be31b1f3d43e3d208ca3e622211b6b54d1bbd9acc","src/os/windows.rs":"4cf0530becb6fed439f469e1f22f57de9ae2ac15e39f2a973f4734aee6267ed0","src/path.rs":"a026ae234184ed1bbadd9051099e201c3ac6309b1fd939d1b2d2b2a7cb82230d"},"package":"64db3e262960f0662f43a6366788d5f10f7f244b8f7d7d987f560baf5ded5c50"}
\ No newline at end of file
diff --git a/vendor/fs-err/CHANGELOG.md b/vendor/fs-err/CHANGELOG.md
index bc973e22c..ee7e4be32 100644
--- a/vendor/fs-err/CHANGELOG.md
+++ b/vendor/fs-err/CHANGELOG.md
@@ -1,5 +1,22 @@
 # fs-err Changelog

 

+## 2.8.1

+

+* Fixed docs.rs build

+

+## 2.8.0

+

+* Implement I/O safety traits (`AsFd`/`AsHandle`, `Into<OwnedFd>`/`Into<OwnedHandle>`) for file. This feature requires Rust 1.63 or later and is gated behind the `io_safety` feature flag. ([#39](https://github.com/andrewhickman/fs-err/pull/39))

+

+## 2.7.0

+

+* Implement `From<fs_err::File> for std::fs::File` ([#38](https://github.com/andrewhickman/fs-err/pull/38))

+

+## 2.6.0

+

+* Added [`File::into_parts`](https://docs.rs/fs-err/2.6.0/fs_err/struct.File.html#method.into_parts) and [`File::file_mut`](https://docs.rs/fs-err/2.6.0/fs_err/struct.File.html#method.file_mut) to provide more access to the underlying `std::fs::File`.

+* Fixed some typos in documention ([#33](https://github.com/andrewhickman/fs-err/pull/33))

+

 ## 2.5.0

 * Added `symlink` for unix platforms

 * Added `symlink_file` and `symlink_dir` for windows

@@ -11,7 +28,7 @@
   - Added trait wrappers for `std::os::{unix, windows}::fs::OpenOptionsExt` and implemented them for `fs_err::OpenOptions`

 * Improved compile times by converting arguments early and forwarding only a small number of types internally. There will be a slight performance hit only in the error case.

 * Reduced trait bounds on generics from `AsRef<Path> + Into<PathBuf>` to either `AsRef<Path>` or `Into<PathBuf>`, making the functions more general.

-  

+

 ## 2.4.0

 * Added `canonicalize`, `hard link`, `read_link`, `rename`, `symlink_metadata` and `soft_link`. ([#25](https://github.com/andrewhickman/fs-err/pull/25))

 * Added aliases to `std::path::Path` via extension trait ([#26](https://github.com/andrewhickman/fs-err/pull/26))

diff --git a/vendor/fs-err/Cargo.toml b/vendor/fs-err/Cargo.toml
index 62c4c651c..07bada50a 100644
--- a/vendor/fs-err/Cargo.toml
+++ b/vendor/fs-err/Cargo.toml
@@ -3,28 +3,53 @@
 # When uploading crates to the registry Cargo will automatically
 # "normalize" Cargo.toml files for maximal compatibility
 # with all versions of Cargo and also rewrite `path` dependencies
-# to registry (e.g., crates.io) dependencies
+# to registry (e.g., crates.io) dependencies.
 #
-# If you believe there's an error in this file please file an
-# issue against the rust-lang/cargo repository. If you're
-# editing this file be aware that the upstream Cargo.toml
-# will likely look very different (and much more reasonable)
+# If you are reading this file be aware that the original Cargo.toml
+# will likely look very different (and much more reasonable).
+# See Cargo.toml.orig for the original contents.
 
 [package]
 edition = "2018"
 name = "fs-err"
-version = "2.5.0"
+version = "2.8.1"
 authors = ["Andrew Hickman <andrew.hickman1@sky.com>"]
+exclude = [
+    ".github",
+    ".gitignore",
+    "README.tpl",
+]
 description = "A drop-in replacement for std::fs with more helpful error messages."
 documentation = "https://docs.rs/fs-err"
 readme = "README.md"
-categories = ["command-line-interface", "filesystem"]
+categories = [
+    "command-line-interface",
+    "filesystem",
+]
 license = "MIT/Apache-2.0"
 repository = "https://github.com/andrewhickman/fs-err"
 
+[package.metadata.release]
+tag-name = "{{version}}"
+sign-tag = true
+
+[[package.metadata.release.pre-release-replacements]]
+file = "src/lib.rs"
+search = 'html_root_url = "https://docs\.rs/fs-err/.*?"'
+replace = "html_root_url = \"https://docs.rs/fs-err/{{version}}\""
+exactly = 1
+
+[package.metadata.docs.rs]
+all-features = true
+rustdoc-args = [
+    "--cfg",
+    "docsrs",
+]
+
 [dependencies]
+
 [dev-dependencies.serde_json]
-version = "1.0.48"
+version = "1.0.64"
 
-[dev-dependencies.version-sync]
-version = "0.8.1"
+[features]
+io_safety = []
diff --git a/vendor/fs-err/README.md b/vendor/fs-err/README.md
index 70bf1fa44..0dc5fc1c3 100644
--- a/vendor/fs-err/README.md
+++ b/vendor/fs-err/README.md
@@ -11,7 +11,7 @@
 

 fs-err is a drop-in replacement for [`std::fs`][std::fs] that provides more

 helpful messages on errors. Extra information includes which operations was

-attmpted and any involved paths.

+attempted and any involved paths.

 

 ## Error Messages

 

diff --git a/vendor/fs-err/README.tpl b/vendor/fs-err/README.tpl
deleted file mode 100644
index 35ac8052d..000000000
--- a/vendor/fs-err/README.tpl
+++ /dev/null
@@ -1,28 +0,0 @@
-<!--

-	This readme is created with https://github.com/livioribeiro/cargo-readme

-

-	Edit `src/lib.rs` and use `cargo readme > README.md` to update it.

--->

-

-# {{crate}}

-

-[![Crates.io](https://img.shields.io/crates/v/fs-err.svg)](https://crates.io/crates/fs-err)

-[![GitHub Actions](https://github.com/andrewhickman/fs-err/workflows/CI/badge.svg)](https://github.com/andrewhickman/fs-err/actions?query=workflow%3ACI)

-

-{{readme}}

-

-## License

-

-Licensed under either of

-

-* Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or https://www.apache.org/licenses/LICENSE-2.0)

-* MIT license ([LICENSE-MIT](LICENSE-MIT) or https://opensource.org/licenses/MIT)

-

-at your option.

-

-### Contribution

-

-Unless you explicitly state otherwise, any contribution intentionally

-submitted for inclusion in the work by you, as defined in the Apache-2.0

-license, shall be dual licensed as above, without any additional terms or

-conditions.
\ No newline at end of file
diff --git a/vendor/fs-err/src/dir.rs b/vendor/fs-err/src/dir.rs
index adba643b9..6efa58da6 100644
--- a/vendor/fs-err/src/dir.rs
+++ b/vendor/fs-err/src/dir.rs
@@ -11,7 +11,7 @@ pub fn read_dir<P: Into<PathBuf>>(path: P) -> io::Result<ReadDir> {
 

     match fs::read_dir(&path) {

         Ok(inner) => Ok(ReadDir { inner, path }),

-        Err(source) => Err(Error::new(source, ErrorKind::ReadDir, path)),

+        Err(source) => Err(Error::build(source, ErrorKind::ReadDir, path)),

     }

 }

 

@@ -32,7 +32,12 @@ impl Iterator for ReadDir {
     type Item = io::Result<DirEntry>;

 

     fn next(&mut self) -> Option<Self::Item> {

-        Some(self.inner.next()?.map(|inner| DirEntry { inner }))

+        Some(

+            self.inner

+                .next()?

+                .map_err(|source| Error::build(source, ErrorKind::ReadDir, &self.path))

+                .map(|inner| DirEntry { inner }),

+        )

     }

 }

 

@@ -55,14 +60,14 @@ impl DirEntry {
     pub fn metadata(&self) -> io::Result<fs::Metadata> {

         self.inner

             .metadata()

-            .map_err(|source| Error::new(source, ErrorKind::Metadata, self.path()))

+            .map_err(|source| Error::build(source, ErrorKind::Metadata, self.path()))

     }

 

     /// Wrapper for [`DirEntry::file_type`](https://doc.rust-lang.org/stable/std/fs/struct.DirEntry.html#method.file_type).

     pub fn file_type(&self) -> io::Result<fs::FileType> {

         self.inner

             .file_type()

-            .map_err(|source| Error::new(source, ErrorKind::Metadata, self.path()))

+            .map_err(|source| Error::build(source, ErrorKind::Metadata, self.path()))

     }

 

     /// Wrapper for [`DirEntry::file_name`](https://doc.rust-lang.org/stable/std/fs/struct.DirEntry.html#method.file_name).

diff --git a/vendor/fs-err/src/errors.rs b/vendor/fs-err/src/errors.rs
index 466d28f11..43bc4ba42 100644
--- a/vendor/fs-err/src/errors.rs
+++ b/vendor/fs-err/src/errors.rs
@@ -47,12 +47,15 @@ pub(crate) struct Error {
 }

 

 impl Error {

-    pub fn new(source: io::Error, kind: ErrorKind, path: impl Into<PathBuf>) -> io::Error {

-        Self::_new(source, kind, path.into())

-    }

-

-    fn _new(source: io::Error, kind: ErrorKind, path: PathBuf) -> io::Error {

-        io::Error::new(source.kind(), Self { kind, source, path })

+    pub fn build(source: io::Error, kind: ErrorKind, path: impl Into<PathBuf>) -> io::Error {

+        io::Error::new(

+            source.kind(),

+            Self {

+                kind,

+                source,

+                path: path.into(),

+            },

+        )

     }

 }

 

@@ -131,28 +134,19 @@ pub(crate) struct SourceDestError {
 }

 

 impl SourceDestError {

-    pub fn new(

+    pub fn build(

         source: io::Error,

         kind: SourceDestErrorKind,

         from_path: impl Into<PathBuf>,

         to_path: impl Into<PathBuf>,

     ) -> io::Error {

-        Self::_new(source, kind, from_path.into(), to_path.into())

-    }

-

-    fn _new(

-        source: io::Error,

-        kind: SourceDestErrorKind,

-        from_path: PathBuf,

-        to_path: PathBuf,

-    ) -> io::Error {

         io::Error::new(

             source.kind(),

             Self {

                 kind,

                 source,

-                from_path,

-                to_path,

+                from_path: from_path.into(),

+                to_path: to_path.into(),

             },

         )

     }

diff --git a/vendor/fs-err/src/file.rs b/vendor/fs-err/src/file.rs
index a9c8988e5..fcf54fe3c 100644
--- a/vendor/fs-err/src/file.rs
+++ b/vendor/fs-err/src/file.rs
@@ -17,12 +17,12 @@ pub struct File {
 // Opens a std File and returns it or an error generator which only needs the path to produce the error.

 // Exists for the `crate::read*` functions so they don't unconditionally build a PathBuf.

 pub(crate) fn open(path: &Path) -> Result<std::fs::File, impl FnOnce(PathBuf) -> io::Error> {

-    fs::File::open(&path).map_err(|err| |path| Error::new(err, ErrorKind::OpenFile, path))

+    fs::File::open(&path).map_err(|err| |path| Error::build(err, ErrorKind::OpenFile, path))

 }

 

 // like `open()` but for `crate::write`

 pub(crate) fn create(path: &Path) -> Result<std::fs::File, impl FnOnce(PathBuf) -> io::Error> {

-    fs::File::create(&path).map_err(|err| |path| Error::new(err, ErrorKind::CreateFile, path))

+    fs::File::create(&path).map_err(|err| |path| Error::build(err, ErrorKind::CreateFile, path))

 }

 

 /// Wrappers for methods from [`std::fs::File`][std::fs::File].

@@ -65,7 +65,7 @@ impl File {
         let path = path.into();

         match options.open(&path) {

             Ok(file) => Ok(File::from_parts(file, path)),

-            Err(source) => Err(Error::new(source, ErrorKind::OpenFile, path)),

+            Err(source) => Err(Error::build(source, ErrorKind::OpenFile, path)),

         }

     }

 

@@ -114,7 +114,13 @@ impl File {
             .set_permissions(perm)

             .map_err(|source| self.error(source, ErrorKind::SetPermissions))

     }

+}

 

+/// Methods added by fs-err that are not available on

+/// [`std::fs::File`][std::fs::File].

+///

+/// [std::fs::File]: https://doc.rust-lang.org/stable/std/fs/struct.File.html

+impl File {

     /// Creates a [`File`](struct.File.html) from a raw file and its path.

     pub fn from_parts<P>(file: fs::File, path: P) -> Self

     where

@@ -125,13 +131,12 @@ impl File {
             path: path.into(),

         }

     }

-}

 

-/// Methods added by fs-err that are not available on

-/// [`std::fs::File`][std::fs::File].

-///

-/// [std::fs::File]: https://doc.rust-lang.org/stable/std/fs/struct.File.html

-impl File {

+    /// Extract the raw file and its path from this [`File`](struct.File.html)

+    pub fn into_parts(self) -> (fs::File, PathBuf) {

+        (self.file, self.path)

+    }

+

     /// Returns a reference to the underlying [`std::fs::File`][std::fs::File].

     ///

     /// [std::fs::File]: https://doc.rust-lang.org/stable/std/fs/struct.File.html

@@ -139,6 +144,13 @@ impl File {
         &self.file

     }

 

+    /// Returns a mutable reference to the underlying [`std::fs::File`][std::fs::File].

+    ///

+    /// [std::fs::File]: https://doc.rust-lang.org/stable/std/fs/struct.File.html

+    pub fn file_mut(&mut self) -> &mut fs::File {

+        &mut self.file

+    }

+

     /// Returns a reference to the path that this file was created with.

     pub fn path(&self) -> &Path {

         &self.path

@@ -146,7 +158,7 @@ impl File {
 

     /// Wrap the error in information specific to this `File` object.

     fn error(&self, source: io::Error, kind: ErrorKind) -> io::Error {

-        Error::new(source, kind, &self.path)

+        Error::build(source, kind, &self.path)

     }

 }

 

@@ -178,6 +190,12 @@ impl<'a> Read for &'a File {
     }

 }

 

+impl From<File> for fs::File {

+    fn from(file: File) -> Self {

+        file.into_parts().0

+    }

+}

+

 impl Seek for File {

     fn seek(&mut self, pos: std::io::SeekFrom) -> std::io::Result<u64> {

         self.file

@@ -266,6 +284,25 @@ mod unix {
                 .map_err(|err| self.error(err, ErrorKind::WriteAt))

         }

     }

+

+    #[cfg(feature = "io_safety")]

+    mod io_safety {

+        use std::os::unix::io::{AsFd, BorrowedFd, OwnedFd};

+

+        #[cfg_attr(docsrs, doc(cfg(feature = "io_safety")))]

+        impl AsFd for crate::File {

+            fn as_fd(&self) -> BorrowedFd<'_> {

+                self.file().as_fd()

+            }

+        }

+

+        #[cfg_attr(docsrs, doc(cfg(feature = "io_safety")))]

+        impl From<crate::File> for OwnedFd {

+            fn from(file: crate::File) -> Self {

+                file.into_parts().0.into()

+            }

+        }

+    }

 }

 

 #[cfg(windows)]

@@ -307,4 +344,23 @@ mod windows {
             self.file.into_raw_handle()

         }

     }

+

+    #[cfg(feature = "io_safety")]

+    mod io_safety {

+        use std::os::windows::io::{AsHandle, BorrowedHandle, OwnedHandle};

+

+        #[cfg_attr(docsrs, doc(cfg(feature = "io_safety")))]

+        impl AsHandle for crate::File {

+            fn as_handle(&self) -> BorrowedHandle<'_> {

+                self.file().as_handle()

+            }

+        }

+

+        #[cfg_attr(docsrs, doc(cfg(feature = "io_safety")))]

+        impl From<crate::File> for OwnedHandle {

+            fn from(file: crate::File) -> Self {

+                file.into_parts().0.into()

+            }

+        }

+    }

 }

diff --git a/vendor/fs-err/src/lib.rs b/vendor/fs-err/src/lib.rs
index 3cc8a3b4d..777db9535 100644
--- a/vendor/fs-err/src/lib.rs
+++ b/vendor/fs-err/src/lib.rs
@@ -1,7 +1,7 @@
 /*!

 fs-err is a drop-in replacement for [`std::fs`][std::fs] that provides more

 helpful messages on errors. Extra information includes which operations was

-attmpted and any involved paths.

+attempted and any involved paths.

 

 # Error Messages

 

@@ -66,8 +66,9 @@ println!("Program config: {:?}", decoded);
 [serde_json]: https://crates.io/crates/serde_json

 */

 

-#![doc(html_root_url = "https://docs.rs/fs-err/2.5.0")]

+#![doc(html_root_url = "https://docs.rs/fs-err/2.8.1")]

 #![deny(missing_debug_implementations, missing_docs)]

+#![cfg_attr(docsrs, feature(doc_cfg))]

 

 mod dir;

 mod errors;

@@ -90,20 +91,20 @@ pub use path::PathExt;
 /// Wrapper for [`fs::read`](https://doc.rust-lang.org/stable/std/fs/fn.read.html).

 pub fn read<P: AsRef<Path>>(path: P) -> io::Result<Vec<u8>> {

     let path = path.as_ref();

-    let mut file = file::open(path.as_ref()).map_err(|err_gen| err_gen(path.to_path_buf()))?;

+    let mut file = file::open(path).map_err(|err_gen| err_gen(path.to_path_buf()))?;

     let mut bytes = Vec::with_capacity(initial_buffer_size(&file));

     file.read_to_end(&mut bytes)

-        .map_err(|err| Error::new(err, ErrorKind::Read, path))?;

+        .map_err(|err| Error::build(err, ErrorKind::Read, path))?;

     Ok(bytes)

 }

 

 /// Wrapper for [`fs::read_to_string`](https://doc.rust-lang.org/stable/std/fs/fn.read_to_string.html).

 pub fn read_to_string<P: AsRef<Path>>(path: P) -> io::Result<String> {

     let path = path.as_ref();

-    let mut file = file::open(path.as_ref()).map_err(|err_gen| err_gen(path.to_path_buf()))?;

+    let mut file = file::open(path).map_err(|err_gen| err_gen(path.to_path_buf()))?;

     let mut string = String::with_capacity(initial_buffer_size(&file));

     file.read_to_string(&mut string)

-        .map_err(|err| Error::new(err, ErrorKind::Read, path))?;

+        .map_err(|err| Error::build(err, ErrorKind::Read, path))?;

     Ok(string)

 }

 

@@ -113,7 +114,7 @@ pub fn write<P: AsRef<Path>, C: AsRef<[u8]>>(path: P, contents: C) -> io::Result
     file::create(path)

         .map_err(|err_gen| err_gen(path.to_path_buf()))?

         .write_all(contents.as_ref())

-        .map_err(|err| Error::new(err, ErrorKind::Write, path))

+        .map_err(|err| Error::build(err, ErrorKind::Write, path))

 }

 

 /// Wrapper for [`fs::copy`](https://doc.rust-lang.org/stable/std/fs/fn.copy.html).

@@ -125,7 +126,7 @@ where
     let from = from.as_ref();

     let to = to.as_ref();

     fs::copy(from, to)

-        .map_err(|source| SourceDestError::new(source, SourceDestErrorKind::Copy, from, to))

+        .map_err(|source| SourceDestError::build(source, SourceDestErrorKind::Copy, from, to))

 }

 

 /// Wrapper for [`fs::create_dir`](https://doc.rust-lang.org/stable/std/fs/fn.create_dir.html).

@@ -134,7 +135,7 @@ where
     P: AsRef<Path>,

 {

     let path = path.as_ref();

-    fs::create_dir(path).map_err(|source| Error::new(source, ErrorKind::CreateDir, path))

+    fs::create_dir(path).map_err(|source| Error::build(source, ErrorKind::CreateDir, path))

 }

 

 /// Wrapper for [`fs::create_dir_all`](https://doc.rust-lang.org/stable/std/fs/fn.create_dir_all.html).

@@ -143,7 +144,7 @@ where
     P: AsRef<Path>,

 {

     let path = path.as_ref();

-    fs::create_dir_all(path).map_err(|source| Error::new(source, ErrorKind::CreateDir, path))

+    fs::create_dir_all(path).map_err(|source| Error::build(source, ErrorKind::CreateDir, path))

 }

 

 /// Wrapper for [`fs::remove_dir`](https://doc.rust-lang.org/stable/std/fs/fn.remove_dir.html).

@@ -152,7 +153,7 @@ where
     P: AsRef<Path>,

 {

     let path = path.as_ref();

-    fs::remove_dir(path).map_err(|source| Error::new(source, ErrorKind::RemoveDir, path))

+    fs::remove_dir(path).map_err(|source| Error::build(source, ErrorKind::RemoveDir, path))

 }

 

 /// Wrapper for [`fs::remove_dir_all`](https://doc.rust-lang.org/stable/std/fs/fn.remove_dir_all.html).

@@ -161,7 +162,7 @@ where
     P: AsRef<Path>,

 {

     let path = path.as_ref();

-    fs::remove_dir_all(path).map_err(|source| Error::new(source, ErrorKind::RemoveDir, path))

+    fs::remove_dir_all(path).map_err(|source| Error::build(source, ErrorKind::RemoveDir, path))

 }

 

 /// Wrapper for [`fs::remove_file`](https://doc.rust-lang.org/stable/std/fs/fn.remove_file.html).

@@ -170,19 +171,19 @@ where
     P: AsRef<Path>,

 {

     let path = path.as_ref();

-    fs::remove_file(path).map_err(|source| Error::new(source, ErrorKind::RemoveFile, path))

+    fs::remove_file(path).map_err(|source| Error::build(source, ErrorKind::RemoveFile, path))

 }

 

 /// Wrapper for [`fs::metadata`](https://doc.rust-lang.org/stable/std/fs/fn.metadata.html).

 pub fn metadata<P: AsRef<Path>>(path: P) -> io::Result<fs::Metadata> {

     let path = path.as_ref();

-    fs::metadata(path).map_err(|source| Error::new(source, ErrorKind::Metadata, path))

+    fs::metadata(path).map_err(|source| Error::build(source, ErrorKind::Metadata, path))

 }

 

 /// Wrapper for [`fs::canonicalize`](https://doc.rust-lang.org/stable/std/fs/fn.canonicalize.html).

 pub fn canonicalize<P: AsRef<Path>>(path: P) -> io::Result<PathBuf> {

     let path = path.as_ref();

-    fs::canonicalize(path).map_err(|source| Error::new(source, ErrorKind::Canonicalize, path))

+    fs::canonicalize(path).map_err(|source| Error::build(source, ErrorKind::Canonicalize, path))

 }

 

 /// Wrapper for [`fs::hard_link`](https://doc.rust-lang.org/stable/std/fs/fn.hard_link.html).

@@ -190,13 +191,13 @@ pub fn hard_link<P: AsRef<Path>, Q: AsRef<Path>>(src: P, dst: Q) -> io::Result<(
     let src = src.as_ref();

     let dst = dst.as_ref();

     fs::hard_link(src, dst)

-        .map_err(|source| SourceDestError::new(source, SourceDestErrorKind::HardLink, src, dst))

+        .map_err(|source| SourceDestError::build(source, SourceDestErrorKind::HardLink, src, dst))

 }

 

 /// Wrapper for [`fs::read_link`](https://doc.rust-lang.org/stable/std/fs/fn.read_link.html).

 pub fn read_link<P: AsRef<Path>>(path: P) -> io::Result<PathBuf> {

     let path = path.as_ref();

-    fs::read_link(path).map_err(|source| Error::new(source, ErrorKind::ReadLink, path))

+    fs::read_link(path).map_err(|source| Error::build(source, ErrorKind::ReadLink, path))

 }

 

 /// Wrapper for [`fs::rename`](https://doc.rust-lang.org/stable/std/fs/fn.rename.html).

@@ -204,7 +205,7 @@ pub fn rename<P: AsRef<Path>, Q: AsRef<Path>>(from: P, to: Q) -> io::Result<()>
     let from = from.as_ref();

     let to = to.as_ref();

     fs::rename(from, to)

-        .map_err(|source| SourceDestError::new(source, SourceDestErrorKind::Rename, from, to))

+        .map_err(|source| SourceDestError::build(source, SourceDestErrorKind::Rename, from, to))

 }

 

 /// Wrapper for [`fs::soft_link`](https://doc.rust-lang.org/stable/std/fs/fn.soft_link.html).

@@ -215,21 +216,21 @@ pub fn soft_link<P: AsRef<Path>, Q: AsRef<Path>>(src: P, dst: Q) -> io::Result<(
     let dst = dst.as_ref();

     #[allow(deprecated)]

     fs::soft_link(src, dst)

-        .map_err(|source| SourceDestError::new(source, SourceDestErrorKind::SoftLink, src, dst))

+        .map_err(|source| SourceDestError::build(source, SourceDestErrorKind::SoftLink, src, dst))

 }

 

 /// Wrapper for [`fs::symlink_metadata`](https://doc.rust-lang.org/stable/std/fs/fn.symlink_metadata.html).

 pub fn symlink_metadata<P: AsRef<Path>>(path: P) -> io::Result<fs::Metadata> {

     let path = path.as_ref();

     fs::symlink_metadata(path)

-        .map_err(|source| Error::new(source, ErrorKind::SymlinkMetadata, path))

+        .map_err(|source| Error::build(source, ErrorKind::SymlinkMetadata, path))

 }

 

 /// Wrapper for [`fs::set_permissions`](https://doc.rust-lang.org/stable/std/fs/fn.set_permissions.html).

 pub fn set_permissions<P: AsRef<Path>>(path: P, perm: fs::Permissions) -> io::Result<()> {

     let path = path.as_ref();

     fs::set_permissions(path, perm)

-        .map_err(|source| Error::new(source, ErrorKind::SetPermissions, path))

+        .map_err(|source| Error::build(source, ErrorKind::SetPermissions, path))

 }

 

 fn initial_buffer_size(file: &std::fs::File) -> usize {

diff --git a/vendor/fs-err/src/open_options.rs b/vendor/fs-err/src/open_options.rs
index 2a11a3974..557fa7abe 100644
--- a/vendor/fs-err/src/open_options.rs
+++ b/vendor/fs-err/src/open_options.rs
@@ -5,6 +5,7 @@ pub struct OpenOptions(fs::OpenOptions);
 

 impl OpenOptions {

     /// Wrapper for [`std::fs::OpenOptions::new`](https://doc.rust-lang.org/std/fs/struct.OpenOptions.html#method.new)

+    #[allow(clippy::new_without_default)]

     pub fn new() -> Self {

         OpenOptions(fs::OpenOptions::new())

     }

diff --git a/vendor/fs-err/src/os/unix.rs b/vendor/fs-err/src/os/unix.rs
index 1c0bbc24d..ad7c488c4 100644
--- a/vendor/fs-err/src/os/unix.rs
+++ b/vendor/fs-err/src/os/unix.rs
@@ -11,7 +11,7 @@ pub mod fs {
         let src = src.as_ref();

         let dst = dst.as_ref();

         std::os::unix::fs::symlink(src, dst)

-            .map_err(|err| SourceDestError::new(err, SourceDestErrorKind::Symlink, src, dst))

+            .map_err(|err| SourceDestError::build(err, SourceDestErrorKind::Symlink, src, dst))

     }

 

     /// Wrapper for [`std::os::unix::fs::FileExt`](https://doc.rust-lang.org/std/os/unix/fs/trait.FileExt.html).

@@ -30,9 +30,9 @@ pub mod fs {
     /// The std traits might be extended in the future (See issue [#49961](https://github.com/rust-lang/rust/issues/49961#issuecomment-382751777)).

     /// This trait is sealed and can not be implemented by other crates.

     pub trait OpenOptionsExt: crate::Sealed {

-        /// Wapper for [`OpenOptionsExt::mode`](https://doc.rust-lang.org/std/os/unix/fs/trait.OpenOptionsExt.html#tymethod.mode)

+        /// Wrapper for [`OpenOptionsExt::mode`](https://doc.rust-lang.org/std/os/unix/fs/trait.OpenOptionsExt.html#tymethod.mode)

         fn mode(&mut self, mode: u32) -> &mut Self;

-        /// Wapper for [`OpenOptionsExt::custom_flags`](https://doc.rust-lang.org/std/os/unix/fs/trait.OpenOptionsExt.html#tymethod.custom_flags)

+        /// Wrapper for [`OpenOptionsExt::custom_flags`](https://doc.rust-lang.org/std/os/unix/fs/trait.OpenOptionsExt.html#tymethod.custom_flags)

         fn custom_flags(&mut self, flags: i32) -> &mut Self;

     }

 }

diff --git a/vendor/fs-err/src/os/windows.rs b/vendor/fs-err/src/os/windows.rs
index 3aaa4a2b8..f55985623 100644
--- a/vendor/fs-err/src/os/windows.rs
+++ b/vendor/fs-err/src/os/windows.rs
@@ -8,7 +8,7 @@ pub mod fs {
         let src = src.as_ref();

         let dst = dst.as_ref();

         std::os::windows::fs::symlink_dir(src, dst)

-            .map_err(|err| SourceDestError::new(err, SourceDestErrorKind::SymlinkDir, src, dst))

+            .map_err(|err| SourceDestError::build(err, SourceDestErrorKind::SymlinkDir, src, dst))

     }

 

     /// Wrapper for [std::os::windows::fs::symlink_file](https://doc.rust-lang.org/std/os/windows/fs/fn.symlink_file.html)

@@ -16,7 +16,7 @@ pub mod fs {
         let src = src.as_ref();

         let dst = dst.as_ref();

         std::os::windows::fs::symlink_file(src, dst)

-            .map_err(|err| SourceDestError::new(err, SourceDestErrorKind::SymlinkFile, src, dst))

+            .map_err(|err| SourceDestError::build(err, SourceDestErrorKind::SymlinkFile, src, dst))

     }

 

     /// Wrapper for [`std::os::windows::fs::FileExt`](https://doc.rust-lang.org/std/os/windows/fs/trait.FileExt.html).

diff --git a/vendor/fs-err/src/path.rs b/vendor/fs-err/src/path.rs
index ed6b9eaf1..28549a31c 100644
--- a/vendor/fs-err/src/path.rs
+++ b/vendor/fs-err/src/path.rs
@@ -6,7 +6,7 @@ use std::path::{Path, PathBuf};
 ///

 /// This trait is sealed and can not be implemented by other crates.

 //

-// Because noone else can implement it, we can add methods backwards-compatibly.

+// Because no one else can implement it, we can add methods backwards-compatibly.

 pub trait PathExt: crate::Sealed {

     /// Wrapper for [`crate::metadata`].

     fn fs_err_metadata(&self) -> io::Result<fs::Metadata>;

diff --git a/vendor/fs-err/tests/version-numbers.rs b/vendor/fs-err/tests/version-numbers.rs
deleted file mode 100644
index 41a5ea480..000000000
--- a/vendor/fs-err/tests/version-numbers.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-#[test]

-fn test_readme_deps() {

-    version_sync::assert_markdown_deps_updated!("README.md");

-}

-

-#[test]

-fn test_html_root_url() {

-    version_sync::assert_html_root_url_updated!("src/lib.rs");

-}