Make "unicase + macros" features work

.github/workflows/ci.yml

@@ -13,7 +13,7 @@ jobs:
       fail-fast: false
       matrix:
         # MSRV and nightly
-        version: [1.51.0, nightly]
+        version: [1.60.0, nightly]
     steps:
       - uses: actions/checkout@v2
 
@@ -23,7 +23,7 @@ jobs:
           rustup override set ${{ matrix.version }}
 
       - name: Rustfmt check
-        if: matrix.version == '1.51.0'
+        if: matrix.version == '1.60.0'
         run: |
           rustup component add rustfmt
           cargo fmt --all -- --check
@@ -32,7 +32,7 @@ jobs:
         run: cargo test --workspace --exclude=phf_codegen_test
 
       - name: phf_macros UI test
-        if: matrix.version == '1.51.0'
+        if: matrix.version == '1.60.0'
         working-directory: phf_macros_tests
         run: cargo test -- --ignored --test-threads=1
 
@@ -42,3 +42,6 @@ jobs:
       - name: no_std build check
         working-directory: phf
         run: cargo build --no-default-features
+
+      - name: unicase + macros features check
+        run: cargo check -p unicase-example

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## Unreleased
+
+* Bump up MSRV to 1.60
+* Now the `unicase` feature works fine with the `macros` feature, doesn't need to import `phf-macros` directly.
+
 ## 0.10.1
 
 * Allow serializing `Map` ([#244])

Cargo.toml

@@ -1,6 +1,7 @@
 [workspace]
 members = [
     "phf",
+    "phf/examples/unicase-example",
     "phf_codegen",
     "phf_codegen/test",
     "phf_generator",

README.md

@@ -13,7 +13,7 @@ a 100,000 entry map in roughly .4 seconds. By default statistics are not
 produced, but if you set the environment variable `PHF_STATS` it will issue
 a compiler note about how long it took.
 
-MSRV (minimum supported rust version) is Rust 1.46.
+MSRV (minimum supported rust version) is Rust 1.60.
 
 ## Usage
 

phf/Cargo.toml

@@ -7,6 +7,7 @@ description = "Runtime support for perfect hash function data structures"
 repository = "https://github.com/sfackler/rust-phf"
 edition = "2018"
 readme = "../README.md"
+rust-version = "1.60"
 
 [lib]
 name = "phf"
@@ -17,7 +18,7 @@ test = false
 default = ["std"]
 std = ["phf_shared/std"]
 uncased = ["phf_shared/uncased"]
-unicase = ["phf_shared/unicase"]
+unicase = ["phf_macros?/unicase", "phf_shared/unicase"]
 macros = [
     "phf_macros",
     "proc-macro-hack",

phf/examples/unicase-example/Cargo.toml

@@ -0,0 +1,11 @@
+[package]
+name = "unicase-example"
+version = "0.1.0"
+edition = "2021"
+rust-version = "1.60"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+phf = { version = "0.10", features = ["macros", "unicase"] }
+unicase = "2"

phf/examples/unicase-example/src/main.rs

@@ -0,0 +1,9 @@
+use phf::phf_map;
+use unicase::UniCase;
+
+pub static MAP: phf::Map<UniCase<&'static str>, isize> = phf_map!(
+    UniCase::ascii("Foo") => 0,
+    UniCase::unicode("Bar") => 1,
+);
+
+fn main() {}

phf/src/lib.rs

@@ -7,7 +7,7 @@
 //! produced, but if you set the environment variable `PHF_STATS` it will issue
 //! a compiler note about how long it took.
 //!
-//! MSRV (minimum supported rust version) is Rust 1.46.
+//! MSRV (minimum supported rust version) is Rust 1.60.
 //!
 //! ## Usage
 //!

phf_codegen/Cargo.toml

@@ -7,6 +7,7 @@ description = "Codegen library for PHF types"
 repository = "https://github.com/sfackler/rust-phf"
 edition = "2018"
 readme = "../README.md"
+rust-version = "1.60"
 
 [dependencies]
 phf_generator = "0.10.0"

phf_generator/Cargo.toml

@@ -6,6 +6,7 @@ license = "MIT"
 description = "PHF generation logic"
 repository = "https://github.com/sfackler/rust-phf"
 edition = "2018"
+rust-version = "1.60"
 
 [dependencies]
 rand = { version = "0.8", features = ["small_rng"] }

phf_macros/Cargo.toml

@@ -8,6 +8,7 @@ description = "Macros to generate types in the phf crate"
 repository = "https://github.com/sfackler/rust-phf"
 readme = "../README.md"
 include = ["src/lib.rs"]
+rust-version = "1.60"
 
 [lib]
 proc-macro = true

phf_macros_tests/Cargo.toml

@@ -3,6 +3,7 @@ name = "phf_macros_tests"
 version = "0.1.0"
 authors = ["Yuki Okushi <jtitor@2k36.org>"]
 edition = "2018"
+rust-version = "1.60"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

phf_macros_tests/tests/compile-fail-unicase/equivalent-keys.stderr

@@ -1,7 +1,7 @@
 error: duplicate key
- --> $DIR/equivalent-keys.rs:6:5
+ --> tests/compile-fail-unicase/equivalent-keys.rs:6:5
   |
 6 |     UniCase::ascii("foo") => 42, //~ ERROR duplicate key UniCase("FOO")
   |     ^^^^^^^^^^^^^^^^^^^^^
   |
-  = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
+  = note: this error originates in the macro `proc_macro_call` (in Nightly builds, run with -Z macro-backtrace for more info)

phf_macros_tests/tests/compile-fail/bad-syntax.stderr

@@ -1,7 +1,7 @@
 error: expected identifier
- --> $DIR/bad-syntax.rs:5:5
+ --> tests/compile-fail/bad-syntax.rs:5:5
   |
 5 |     => //~ ERROR expected identifier
   |     ^^
   |
-  = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
+  = note: this error originates in the macro `proc_macro_call` (in Nightly builds, run with -Z macro-backtrace for more info)

phf_shared/Cargo.toml

@@ -6,6 +6,7 @@ license = "MIT"
 description = "Support code shared by PHF libraries"
 repository = "https://github.com/sfackler/rust-phf"
 edition = "2018"
+rust-version = "1.60"
 
 [lib]
 name = "phf_shared"