Auto merge of #6938 - ehuss:fix-ignore-version, r=alexcrichton

Fix version of `ignore`. Some tests relied on new behavior, so bump the minimal version. The change to `gitignore_negate` was just an innocuous typo.
rust-lang · May 14, 2019 · fd3d06b · fd3d06b
2 parents d56af31 + 337fbaa
commit fd3d06b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -37,7 +37,7 @@ git2-curl = "0.9.0"
 glob = "0.3.0"
 hex = "0.3"
 home = "0.3"
-ignore = "0.4"
+ignore = "0.4.7"
 lazy_static = "1.2.0"
 jobserver = "0.1.13"
 lazycell = "1.2.0"

diff --git a/tests/testsuite/package.rs b/tests/testsuite/package.rs
@@ -1337,7 +1337,7 @@ fn gitignore_negate() {
     );
 
     include_exclude_test(
-        r#"["Cargo.toml", "src/**.rs", "!foo.rs"]"#, // include
+        r#"["Cargo.toml", "src/*.rs", "!foo.rs"]"#, // include
         "[]",
         &["src/lib.rs", "foo.rs", "src/foo.rs", "src/bar/foo.rs"],
         "Cargo.toml\n\