diff options
Diffstat (limited to 'vendor/walkdir')
-rw-r--r-- | vendor/walkdir/.cargo-checksum.json | 2 | ||||
-rw-r--r-- | vendor/walkdir/Cargo.toml | 30 | ||||
-rw-r--r-- | vendor/walkdir/src/dent.rs | 37 | ||||
-rw-r--r-- | vendor/walkdir/src/error.rs | 11 | ||||
-rw-r--r-- | vendor/walkdir/src/lib.rs | 6 |
5 files changed, 34 insertions, 52 deletions
diff --git a/vendor/walkdir/.cargo-checksum.json b/vendor/walkdir/.cargo-checksum.json index 1002a325a..d90dfa135 100644 --- a/vendor/walkdir/.cargo-checksum.json +++ b/vendor/walkdir/.cargo-checksum.json @@ -1 +1 @@ -{"files":{"COPYING":"01c266bced4a434da0051174d6bee16a4c82cf634e2679b6155d40d75012390f","Cargo.toml":"421e6948e2f34af6a8392512de0faaac8837b899b0e31df76ee45ca6f2246659","LICENSE-MIT":"0f96a83840e146e43c0ec96a22ec1f392e0680e6c1226e6f3ba87e0740af850f","README.md":"5fc28c8211fe74af2889a2eb859127f8d543e0f94be80659c307105ed831f84b","UNLICENSE":"7e12e5df4bae12cb21581ba157ced20e1986a0508dd10d0e8a4ab9a4cf94e85c","compare/nftw.c":"6b900b0ac78ce8ece1995f834b194fa14d87d744cabba8f475f0e10b21722c56","compare/walk.py":"d49e26d0b8b2b201d00f2f46bf1f9db46f873c27332da679c9a7adbbf54462d2","rustfmt.toml":"1ca600239a27401c4a43f363cf3f38183a212affc1f31bff3ae93234bbaec228","src/dent.rs":"99226b37127b0a18cf8541b0262fb43b1be52e61b5ae5c574499d316185c5f0d","src/error.rs":"f197c5c0a1006e622e053cc3c51aaafa8afd5a287fed30f18db59022876d47a0","src/lib.rs":"dca984890839db697b4182043678287370bd08ff766610e5b46091e70ce49591","src/tests/mod.rs":"bbce9174bfdbb4a81a9000f702be056b63b439cb8f1bcac64b8569368627d56d","src/tests/recursive.rs":"1afd9bb86cb04e8fead4d1e075efe00f6e16d7cf17bb3014f8c94e8adf869bea","src/tests/util.rs":"ca72ef96f82bb87d8c93d13d581ebb65efcd53fffa87097a84437acecbc30faa","src/util.rs":"14e0da711cad4825ead21446cd61a1444fd49bab853a8a239d8cb74b2caab351"},"package":"808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56"}
\ No newline at end of file +{"files":{"COPYING":"01c266bced4a434da0051174d6bee16a4c82cf634e2679b6155d40d75012390f","Cargo.toml":"ca0ae974da5ac27e19ee2644ad445056f121f74ece668103c48f6a9efbc09c71","LICENSE-MIT":"0f96a83840e146e43c0ec96a22ec1f392e0680e6c1226e6f3ba87e0740af850f","README.md":"5fc28c8211fe74af2889a2eb859127f8d543e0f94be80659c307105ed831f84b","UNLICENSE":"7e12e5df4bae12cb21581ba157ced20e1986a0508dd10d0e8a4ab9a4cf94e85c","compare/nftw.c":"6b900b0ac78ce8ece1995f834b194fa14d87d744cabba8f475f0e10b21722c56","compare/walk.py":"d49e26d0b8b2b201d00f2f46bf1f9db46f873c27332da679c9a7adbbf54462d2","rustfmt.toml":"1ca600239a27401c4a43f363cf3f38183a212affc1f31bff3ae93234bbaec228","src/dent.rs":"ca573f4533370a09851579f5940f7cd9bd121b2f30ec51d29a40afdce984683b","src/error.rs":"ba58bf6f59d196567435d4b66699a928cc237fc7c8df01dc37ab822509905b7c","src/lib.rs":"d964635f63cd73487c10a4e32440c30d9d25c43baca02d2f5313b48cd9a40e1c","src/tests/mod.rs":"bbce9174bfdbb4a81a9000f702be056b63b439cb8f1bcac64b8569368627d56d","src/tests/recursive.rs":"1afd9bb86cb04e8fead4d1e075efe00f6e16d7cf17bb3014f8c94e8adf869bea","src/tests/util.rs":"ca72ef96f82bb87d8c93d13d581ebb65efcd53fffa87097a84437acecbc30faa","src/util.rs":"14e0da711cad4825ead21446cd61a1444fd49bab853a8a239d8cb74b2caab351"},"package":"36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698"}
\ No newline at end of file diff --git a/vendor/walkdir/Cargo.toml b/vendor/walkdir/Cargo.toml index 49c666254..7db926327 100644 --- a/vendor/walkdir/Cargo.toml +++ b/vendor/walkdir/Cargo.toml @@ -3,37 +3,45 @@ # 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 = "walkdir" -version = "2.3.2" +version = "2.3.3" authors = ["Andrew Gallant <jamslam@gmail.com>"] -exclude = ["/ci/*", "/.travis.yml", "/appveyor.yml"] +exclude = [ + "/ci/*", + "/.travis.yml", + "/appveyor.yml", +] description = "Recursively walk a directory." homepage = "https://github.com/BurntSushi/walkdir" documentation = "https://docs.rs/walkdir/" readme = "README.md" -keywords = ["directory", "recursive", "walk", "iterator"] +keywords = [ + "directory", + "recursive", + "walk", + "iterator", +] categories = ["filesystem"] license = "Unlicense/MIT" repository = "https://github.com/BurntSushi/walkdir" + [dependencies.same-file] version = "1.0.1" + [dev-dependencies.doc-comment] version = "0.3" -[target."cfg(windows)".dependencies.winapi] -version = "0.3" -features = ["std", "winnt"] [target."cfg(windows)".dependencies.winapi-util] version = "0.1.1" + [badges.appveyor] repository = "BurntSushi/walkdir" diff --git a/vendor/walkdir/src/dent.rs b/vendor/walkdir/src/dent.rs index a28ed3dea..adf54f739 100644 --- a/vendor/walkdir/src/dent.rs +++ b/vendor/walkdir/src/dent.rs @@ -177,18 +177,6 @@ impl DirEntry { } /// Returns true if and only if this entry points to a directory. - /// - /// This works around a bug in Rust's standard library: - /// https://github.com/rust-lang/rust/issues/46484 - #[cfg(windows)] - pub(crate) fn is_dir(&self) -> bool { - use std::os::windows::fs::MetadataExt; - use winapi::um::winnt::FILE_ATTRIBUTE_DIRECTORY; - self.metadata.file_attributes() & FILE_ATTRIBUTE_DIRECTORY != 0 - } - - /// Returns true if and only if this entry points to a directory. - #[cfg(not(windows))] pub(crate) fn is_dir(&self) -> bool { self.ty.is_dir() } @@ -205,13 +193,7 @@ impl DirEntry { let md = ent .metadata() .map_err(|err| Error::from_path(depth, path.clone(), err))?; - Ok(DirEntry { - path: path, - ty: ty, - follow_link: false, - depth: depth, - metadata: md, - }) + Ok(DirEntry { path, ty, follow_link: false, depth, metadata: md }) } #[cfg(unix)] @@ -226,9 +208,9 @@ impl DirEntry { .map_err(|err| Error::from_path(depth, ent.path(), err))?; Ok(DirEntry { path: ent.path(), - ty: ty, + ty, follow_link: false, - depth: depth, + depth, ino: ent.ino(), }) } @@ -241,12 +223,7 @@ impl DirEntry { let ty = ent .file_type() .map_err(|err| Error::from_path(depth, ent.path(), err))?; - Ok(DirEntry { - path: ent.path(), - ty: ty, - follow_link: false, - depth: depth, - }) + Ok(DirEntry { path: ent.path(), ty, follow_link: false, depth }) } #[cfg(windows)] @@ -266,7 +243,7 @@ impl DirEntry { path: pb, ty: md.file_type(), follow_link: follow, - depth: depth, + depth, metadata: md, }) } @@ -290,7 +267,7 @@ impl DirEntry { path: pb, ty: md.file_type(), follow_link: follow, - depth: depth, + depth, ino: md.ino(), }) } @@ -312,7 +289,7 @@ impl DirEntry { path: pb, ty: md.file_type(), follow_link: follow, - depth: depth, + depth, }) } } diff --git a/vendor/walkdir/src/error.rs b/vendor/walkdir/src/error.rs index 9e25a075e..3342d9b75 100644 --- a/vendor/walkdir/src/error.rs +++ b/vendor/walkdir/src/error.rs @@ -164,10 +164,7 @@ impl Error { pb: PathBuf, err: io::Error, ) -> Self { - Error { - depth: depth, - inner: ErrorInner::Io { path: Some(pb), err: err }, - } + Error { depth, inner: ErrorInner::Io { path: Some(pb), err } } } pub(crate) fn from_entry(dent: &DirEntry, err: io::Error) -> Self { @@ -175,13 +172,13 @@ impl Error { depth: dent.depth(), inner: ErrorInner::Io { path: Some(dent.path().to_path_buf()), - err: err, + err, }, } } pub(crate) fn from_io(depth: usize, err: io::Error) -> Self { - Error { depth: depth, inner: ErrorInner::Io { path: None, err: err } } + Error { depth, inner: ErrorInner::Io { path: None, err } } } pub(crate) fn from_loop( @@ -190,7 +187,7 @@ impl Error { child: &Path, ) -> Self { Error { - depth: depth, + depth, inner: ErrorInner::Loop { ancestor: ancestor.to_path_buf(), child: child.to_path_buf(), diff --git a/vendor/walkdir/src/lib.rs b/vendor/walkdir/src/lib.rs index 929c5655e..4d41515df 100644 --- a/vendor/walkdir/src/lib.rs +++ b/vendor/walkdir/src/lib.rs @@ -601,7 +601,7 @@ impl Ancestor { #[cfg(windows)] fn new(dent: &DirEntry) -> io::Result<Ancestor> { let handle = Handle::from_path(dent.path())?; - Ok(Ancestor { path: dent.path().to_path_buf(), handle: handle }) + Ok(Ancestor { path: dent.path().to_path_buf(), handle }) } /// Create a new ancestor from the given directory path. @@ -811,7 +811,7 @@ impl IntoIter { where P: FnMut(&DirEntry) -> bool, { - FilterEntry { it: self, predicate: predicate } + FilterEntry { it: self, predicate } } fn handle_entry( @@ -1109,7 +1109,7 @@ where /// [`min_depth`]: struct.WalkDir.html#method.min_depth /// [`max_depth`]: struct.WalkDir.html#method.max_depth pub fn filter_entry(self, predicate: P) -> FilterEntry<Self, P> { - FilterEntry { it: self, predicate: predicate } + FilterEntry { it: self, predicate } } /// Skips the current directory. |