From d9b5ff23367d2bbcc385ff8243c7d972f45d459c Mon Sep 17 00:00:00 2001 From: Yuki Okushi Date: Fri, 20 Aug 2021 15:58:46 +0900 Subject: [PATCH] Fix CI failure - Bumps up MSRV to 1.46 completely to fix CI. - Updates some reference to the crate version. --- .github/workflows/ci.yml | 7 +++---- README.md | 2 +- phf/src/lib.rs | 6 +++--- phf_codegen/src/lib.rs | 2 +- phf_generator/src/lib.rs | 2 +- phf_macros/Cargo.toml | 2 +- .../tests/compile-fail-unicase/equivalent-keys.stderr | 2 ++ phf_macros/tests/compile-fail/bad-syntax.stderr | 2 ++ phf_shared/src/lib.rs | 2 +- 9 files changed, 15 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6d0170cb..8928defc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,7 @@ jobs: fail-fast: false matrix: # MSRV and nightly - version: [1.41.0, 1.46.0, nightly] + version: [1.46.0, nightly] steps: - uses: actions/checkout@v2 @@ -23,7 +23,7 @@ jobs: rustup override set ${{ matrix.version }} - name: Rustfmt check - if: matrix.version == '1.41.0' + if: matrix.version == '1.46.0' run: | rustup component add rustfmt cargo fmt --all -- --check @@ -32,12 +32,11 @@ jobs: run: cargo test --workspace --exclude=phf_codegen_test - name: phf_macros UI test - if: matrix.version == '1.41.0' + if: matrix.version == '1.46.0' working-directory: phf_macros run: cargo test --features=unicase -- --ignored --test-threads=1 - name: phf_codegen test - if: matrix.version != '1.41.0' # `uncased` requires 1.46 or higher. run: cargo test -p phf_codegen_test - name: no_std build check diff --git a/README.md b/README.md index 63c6febb..c38bcb1a 100644 --- a/README.md +++ b/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.41, or 1.46 if you use the `uncased` feature. +MSRV (minimum supported rust version) is Rust 1.46. ## Usage diff --git a/phf/src/lib.rs b/phf/src/lib.rs index ba3b8172..c29b9be3 100644 --- a/phf/src/lib.rs +++ b/phf/src/lib.rs @@ -8,12 +8,12 @@ //! If the `macros` Cargo feature is enabled, the `phf_map`, `phf_set`, //! `phf_ordered_map`, and `phf_ordered_set` macros can be used to construct //! the PHF type. This method can be used with a stable compiler -//! (minimum supported rust version is 1.41, or 1.46 if you use the `uncased` +//! (minimum supported rust version is 1.46. //! feature). //! //! ```toml //! [dependencies] -//! phf = { version = "0.9", features = ["macros"] } +//! phf = { version = "0.10", features = ["macros"] } //! ``` //! //! ``` @@ -45,7 +45,7 @@ //! //! [#183]: https://github.com/rust-phf/rust-phf/issues/183 //! [#196]: https://github.com/rust-phf/rust-phf/issues/196 -#![doc(html_root_url = "https://docs.rs/phf/0.9")] +#![doc(html_root_url = "https://docs.rs/phf/0.10")] #![warn(missing_docs)] #![cfg_attr(not(feature = "std"), no_std)] diff --git a/phf_codegen/src/lib.rs b/phf_codegen/src/lib.rs index dfcf6ed0..3a6c3336 100644 --- a/phf_codegen/src/lib.rs +++ b/phf_codegen/src/lib.rs @@ -123,7 +123,7 @@ //! builder.entry("world", "2"); //! // ... //! ``` -#![doc(html_root_url = "https://docs.rs/phf_codegen/0.9")] +#![doc(html_root_url = "https://docs.rs/phf_codegen/0.10")] use phf_shared::{FmtConst, PhfHash}; use std::collections::HashSet; diff --git a/phf_generator/src/lib.rs b/phf_generator/src/lib.rs index 6c848ce5..d4b83557 100644 --- a/phf_generator/src/lib.rs +++ b/phf_generator/src/lib.rs @@ -1,4 +1,4 @@ -#![doc(html_root_url = "https://docs.rs/phf_generator/0.9")] +#![doc(html_root_url = "https://docs.rs/phf_generator/0.10")] use phf_shared::{HashKey, PhfHash}; use rand::distributions::Standard; use rand::rngs::SmallRng; diff --git a/phf_macros/Cargo.toml b/phf_macros/Cargo.toml index 69c34c4b..474bf8cb 100644 --- a/phf_macros/Cargo.toml +++ b/phf_macros/Cargo.toml @@ -27,5 +27,5 @@ phf_shared = { version = "0.10.0", default-features = false } [dev-dependencies] trybuild = "1.0" -phf = { version = "0.9", features = ["macros", "unicase"] } +phf = { version = "0.10", features = ["macros", "unicase"] } unicase_ = { package = "unicase", version = "2.4.0" } diff --git a/phf_macros/tests/compile-fail-unicase/equivalent-keys.stderr b/phf_macros/tests/compile-fail-unicase/equivalent-keys.stderr index d4180e2a..11033581 100644 --- a/phf_macros/tests/compile-fail-unicase/equivalent-keys.stderr +++ b/phf_macros/tests/compile-fail-unicase/equivalent-keys.stderr @@ -3,3 +3,5 @@ error: duplicate key | 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) diff --git a/phf_macros/tests/compile-fail/bad-syntax.stderr b/phf_macros/tests/compile-fail/bad-syntax.stderr index bd387e6d..ce42934b 100644 --- a/phf_macros/tests/compile-fail/bad-syntax.stderr +++ b/phf_macros/tests/compile-fail/bad-syntax.stderr @@ -3,3 +3,5 @@ error: expected identifier | 5 | => //~ ERROR expected identifier | ^^ + | + = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info) diff --git a/phf_shared/src/lib.rs b/phf_shared/src/lib.rs index 79b119a3..1b6fe827 100644 --- a/phf_shared/src/lib.rs +++ b/phf_shared/src/lib.rs @@ -1,4 +1,4 @@ -#![doc(html_root_url = "https://docs.rs/phf_shared/0.9")] +#![doc(html_root_url = "https://docs.rs/phf_shared/0.10")] #![cfg_attr(not(feature = "std"), no_std)] #[cfg(feature = "std")]