From cd575d99f854110a184c731e1eab3397259a12a7 Mon Sep 17 00:00:00 2001 From: Andrew Gallant Date: Sat, 21 Oct 2017 19:27:04 -0400 Subject: ignore: upgrade to walkdir 2 The uninteresting bits of this commit involve mechanical changes for updates to walkdir 2. The more interesting bits of this commit are the breaking changes, although none of them should require any significant change on users of this library. The breaking changes are as follows: * `DirEntry::path_is_symbolic_link` has been renamed to `DirEntry::path_is_symlink`. This matches the conventions in the standard library, and also the corresponding name change in walkdir. * Removed the `From for ignore::Error` impl. This was intended to only be used internally, but was the only thing that made `walkdir` a public dependency of `ignore`. Therefore, we remove it since it seems unnecessary. * Renamed `WalkBuilder::sort_by` to `WalkBuilder::sort_by_file_name`, and changed the type of the comparator from Fn(&OsString, &OsString) -> cmp::Ordering + 'static to Fn(&OsStr, &OsStr) -> cmp::Ordering + Send + Sync + 'static The corresponding change in `walkdir` retains the `sort_by` name, but gives the comparator a pair of `&DirEntry` values instead of a pair of `&OsStr` values. Ideally, `ignore` would hand off its own pair of `&ignore::DirEntry` values, but this requires more design work. So for now, we retain previous functionality, but leave room to make a proper `sort_by` method. [breaking-change] --- ignore/Cargo.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'ignore/Cargo.toml') diff --git a/ignore/Cargo.toml b/ignore/Cargo.toml index 0fa01090..660ee39c 100644 --- a/ignore/Cargo.toml +++ b/ignore/Cargo.toml @@ -24,8 +24,9 @@ lazy_static = "0.2" log = "0.3" memchr = "2" regex = "0.2.1" +same-file = "1" thread_local = "0.3.2" -walkdir = "1.0.7" +walkdir = "2" [dev-dependencies] tempdir = "0.3.5" -- cgit v1.2.3