Merge pull request #241 from JohnTitor/extract-macro-tests

rust-phf · Oct 16, 2021 · 7b0a313 · 7b0a313
2 parents da98b9e + 8cf694d
commit 7b0a313
Show file tree

Hide file tree

Showing 13 changed files with 27 additions and 13 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -33,8 +33,8 @@ jobs:
 
       - name: phf_macros UI test
         if: matrix.version == '1.46.0'
-        working-directory: phf_macros
-        run: cargo test --features=unicase -- --ignored --test-threads=1
+        working-directory: phf_macros_tests
+        run: cargo test -- --ignored --test-threads=1
 
       - name: phf_codegen test
         run: cargo test -p phf_codegen_test

diff --git a/Cargo.toml b/Cargo.toml
@@ -5,12 +5,12 @@ members = [
     "phf_codegen/test",
     "phf_generator",
     "phf_macros",
+    "phf_macros_tests",
     "phf_shared"
 ]
 
 [patch.crates-io]
 phf = { path = "phf" }
-phf_codegen = { path = "./phf_codegen" }
 phf_generator = { path = "./phf_generator" }
 phf_macros = { path = "./phf_macros" }
 phf_shared = { path = "./phf_shared" }
diff --git a/phf_codegen/test/Cargo.toml b/phf_codegen/test/Cargo.toml
@@ -11,6 +11,6 @@ uncased = { version = "0.9.6", default-features = false }
 unicase = "2.4.0"
 
 [build-dependencies]
-phf_codegen = "0.10.0"
+phf_codegen = { version = "0.10.0", path = ".." }
 unicase = "2.4.0"
 uncased = { version = "0.9.6", default-features = false }
diff --git a/phf_macros/Cargo.toml b/phf_macros/Cargo.toml
@@ -24,8 +24,3 @@ unicase_ = { package = "unicase", version = "2.4.0", optional = true }
 
 phf_generator = "0.10.0"
 phf_shared = { version = "0.10.0", default-features = false }
-
-[dev-dependencies]
-trybuild = "1.0"
-phf = { version = "0.10", features = ["macros", "unicase"] }
-unicase_ = { package = "unicase", version = "2.4.0" }
diff --git a/phf_macros_tests/Cargo.toml b/phf_macros_tests/Cargo.toml
@@ -0,0 +1,15 @@
+[package]
+name = "phf_macros_tests"
+version = "0.1.0"
+authors = ["Yuki Okushi <jtitor@2k36.org>"]
+edition = "2018"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+
+[dev-dependencies]
+trybuild = "1.0"
+phf = { version = "0.10", features = ["macros"] }
+phf_macros = { version = "0.10", features = ["unicase"] }
+unicase = "2.4.0"
diff --git a/phf_macros/benches/bench.rs → phf_macros_tests/benches/bench.rs b/phf_macros/benches/bench.rs → phf_macros_tests/benches/bench.rs
diff --git a/phf_macros_tests/src/lib.rs b/phf_macros_tests/src/lib.rs
@@ -0,0 +1 @@
+
diff --git a/...s/compile-fail-unicase/equivalent-keys.rs → ...s/compile-fail-unicase/equivalent-keys.rs b/...s/compile-fail-unicase/equivalent-keys.rs → ...s/compile-fail-unicase/equivalent-keys.rs
@@ -1,4 +1,4 @@
-use unicase_::UniCase;
+use unicase::UniCase;
 use phf::phf_map;
 
 static MAP: phf::Map<UniCase<&'static str>, isize> = phf_map!(

diff --git a/...mpile-fail-unicase/equivalent-keys.stderr → ...mpile-fail-unicase/equivalent-keys.stderr b/...mpile-fail-unicase/equivalent-keys.stderr → ...mpile-fail-unicase/equivalent-keys.stderr
diff --git a/phf_macros/tests/compile-fail/bad-syntax.rs → ...os_tests/tests/compile-fail/bad-syntax.rs b/phf_macros/tests/compile-fail/bad-syntax.rs → ...os_tests/tests/compile-fail/bad-syntax.rs
diff --git a/...cros/tests/compile-fail/bad-syntax.stderr → ...ests/tests/compile-fail/bad-syntax.stderr b/...cros/tests/compile-fail/bad-syntax.stderr → ...ests/tests/compile-fail/bad-syntax.stderr
diff --git a/phf_macros/tests/test.rs → phf_macros_tests/tests/test.rs b/phf_macros/tests/test.rs → phf_macros_tests/tests/test.rs
@@ -240,10 +240,9 @@ mod map {
         }
     }
 
-    #[cfg(feature = "unicase")]
     #[test]
     fn test_unicase() {
-        use unicase_::UniCase;
+        use unicase::UniCase;
         static MAP: phf::Map<UniCase<&'static str>, isize> = phf_map!(
             UniCase::ascii("FOO") => 10,
             UniCase::unicode("Bar") => 11,

diff --git a/phf_macros/tests/compiletest.rs → phf_macros_tests/tests/trybuild.rs b/phf_macros/tests/compiletest.rs → phf_macros_tests/tests/trybuild.rs
@@ -1,5 +1,9 @@
+// The diagnostics may be different between stable and nightly, so
+// we mark them as `#[ignore]` and invoke with `--ignored` explicitly
+// when testing.
+
 #[test]
-#[ignore] // diagnostics may be different between stable and nightly.
+#[ignore]
 fn compile_test_unicase() {
     let t = trybuild::TestCases::new();
     t.compile_fail("tests/compile-fail-unicase/*.rs");