commit e913492b3a2f36c4cfbaf745935d6420e697d860
author David Tolnay <dtolnay@gmail.com> Sat Mar 17 13:05:47 2018 -0700
committer GitHub <noreply@github.com> Sat Mar 17 13:05:47 2018 -0700
tree 80a1a9f2c68a4f51a19f06b759419e48b6d1695d
parent ba9f8f65aa45a0dba3afa5bb7f33213a9344af95
parent 951a52be05a36f51adc7463e1ff29f6c9c045892

Merge pull request #371 from ignatenkobrain/patch-1

deps: update walkdir to 2

Cargo.toml

diff --git a/Cargo.toml b/Cargo.toml
index 4e58a0a..2793250 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -33,7 +33,7 @@
 
 [dev-dependencies]
 rayon = "1.0.0"
-walkdir = "1.0.1"
+walkdir = "2"
 
 [package.metadata.docs.rs]
 all-features = true

tests/test_precedence.rs

diff --git a/tests/test_precedence.rs b/tests/test_precedence.rs
index 988b7e5..e427800 100644
--- a/tests/test_precedence.rs
+++ b/tests/test_precedence.rs
@@ -30,7 +30,7 @@
 use rayon::iter::{IntoParallelIterator, ParallelIterator};
 use syntax::ast;
 use syntax::ptr::P;
-use walkdir::{DirEntry, WalkDir, WalkDirIterator};
+use walkdir::{DirEntry, WalkDir};
 
 use std::fs::File;
 use std::io::Read;
@@ -97,7 +97,7 @@
     let failed = AtomicUsize::new(0);
 
     WalkDir::new("tests/rust")
-        .sort_by(|a, b| a.cmp(b))
+        .sort_by(|a, b| a.file_name().cmp(b.file_name()))
         .into_iter()
         .filter_entry(common::base_dir_filter)
         .collect::<Result<Vec<DirEntry>, walkdir::Error>>()

tests/test_round_trip.rs

diff --git a/tests/test_round_trip.rs b/tests/test_round_trip.rs
index 527a0e2..ce829d0 100644
--- a/tests/test_round_trip.rs
+++ b/tests/test_round_trip.rs
@@ -22,7 +22,7 @@
 use syntax::parse::{self, PResult, ParseSess};
 use syntax::codemap::FilePathMapping;
 use syntax_pos::FileName;
-use walkdir::{DirEntry, WalkDir, WalkDirIterator};
+use walkdir::{DirEntry, WalkDir};
 
 use std::fs::File;
 use std::io::Read;
@@ -49,7 +49,7 @@
     let failed = AtomicUsize::new(0);
 
     WalkDir::new("tests/rust")
-        .sort_by(|a, b| a.cmp(b))
+        .sort_by(|a, b| a.file_name().cmp(b.file_name()))
         .into_iter()
         .filter_entry(common::base_dir_filter)
         .collect::<Result<Vec<DirEntry>, walkdir::Error>>()