From 2c8d9814253a485ff28701c88b0678b97df51286 Mon Sep 17 00:00:00 2001 From: Ed Page Date: Tue, 2 Oct 2018 17:21:20 -0600 Subject: [PATCH 1/2] chore: Update dependencies --- .travis.yml | 6 +++--- Cargo.toml | 2 +- src/fs.rs | 5 +++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 86bfb16..06d11ad 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,13 +8,13 @@ rust: matrix: include: - env: RUSTFMT - rust: 1.27.0 # `stable`: Locking down for consistent behavior + rust: 1.29.0 # `stable`: Locking down for consistent behavior install: - rustup component add rustfmt-preview script: - - cargo fmt -- --write-mode=diff + - cargo fmt -- --check - env: RUSTFLAGS="-D warnings" - rust: 1.27.0 # `stable`: Locking down for consistent behavior + rust: 1.29.0 # `stable`: Locking down for consistent behavior install: script: - cargo check --tests --all-features diff --git a/Cargo.toml b/Cargo.toml index 8970a3f..cf8a4d0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,7 +13,7 @@ keywords = ["filesystem", "test", "assert", "fixture"] [dependencies] tempfile = "3.0" -globwalk = "0.4" +globwalk = "0.5" predicates = "0.9" predicates-core = "0.9" predicates-tree = "0.9" diff --git a/src/fs.rs b/src/fs.rs index 72491a5..49d9877 100644 --- a/src/fs.rs +++ b/src/fs.rs @@ -249,9 +249,10 @@ where let source = source .canonicalize() .chain(errors::FixtureError::new(errors::FixtureKind::Walk))?; - for entry in globwalk::GlobWalker::from_patterns(&source, patterns) - .chain(errors::FixtureError::new(errors::FixtureKind::Walk))? + for entry in globwalk::GlobWalkerBuilder::from_patterns(&source, patterns) .follow_links(true) + .build() + .chain(errors::FixtureError::new(errors::FixtureKind::Walk))? { println!("{:?}", entry); let entry = entry.chain(errors::FixtureError::new(errors::FixtureKind::Walk))?; From 72e16f56e54b4c77ae30df53a8d46451dc957b56 Mon Sep 17 00:00:00 2001 From: Ed Page Date: Tue, 2 Oct 2018 17:36:13 -0600 Subject: [PATCH 2/2] chore: Upgrade minimum rustc From 1.22 to 1.27. Needed for dependencies --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 06d11ad..c39c16d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ sudo: false language: rust rust: -- 1.22.0 # oldest supported version +- 1.27.0 # oldest supported version - stable - beta - nightly