Skip to content

Commit

Permalink
Fix CI failure
Browse files Browse the repository at this point in the history
- Bumps up MSRV to 1.46 completely to fix CI.
- Updates some reference to the crate version.
  • Loading branch information
JohnTitor committed Aug 20, 2021
1 parent f5063b0 commit d9b5ff2
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 12 deletions.
7 changes: 3 additions & 4 deletions .github/workflows/ci.yml
Expand Up @@ -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

Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions phf/src/lib.rs
Expand Up @@ -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"] }
//! ```
//!
//! ```
Expand Down Expand Up @@ -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)]

Expand Down
2 changes: 1 addition & 1 deletion phf_codegen/src/lib.rs
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion 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;
Expand Down
2 changes: 1 addition & 1 deletion phf_macros/Cargo.toml
Expand Up @@ -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" }
2 changes: 2 additions & 0 deletions phf_macros/tests/compile-fail-unicase/equivalent-keys.stderr
Expand Up @@ -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)
2 changes: 2 additions & 0 deletions phf_macros/tests/compile-fail/bad-syntax.stderr
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion 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")]
Expand Down

0 comments on commit d9b5ff2

Please sign in to comment.