Skip to content

Commit

Permalink
Allow newer bitflags
Browse files Browse the repository at this point in the history
  • Loading branch information
cwfitzgerald authored and kvark committed Aug 23, 2021
1 parent 70be72d commit 800f910
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 3 deletions.
8 changes: 7 additions & 1 deletion .github/workflows/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,20 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
rust: [1.43.0, nightly]
rust: ["1.43.0", nightly]
steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: ${{ matrix.rust }}
override: true
- uses: actions-rs/cargo@v1
name: Downgrade bitflags to MSRV
if: ${{ matrix.rust }} == "1.43.0"
with:
command: update
args: -p bitflags --precise 1.2.1
- uses: actions-rs/cargo@v1
name: Default test
with:
Expand Down
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ resolver = "2"
all-features = true

[dependencies]
# bitflags 1.3 requires Rust-1.46
bitflags = "~1.2"
# MSRV warning: bitflags 1.3 requires Rust-1.46
bitflags = "1"
bit-set = "0.5"
codespan-reporting = { version = "0.11.0", optional = true }
fxhash = "0.2"
Expand Down
12 changes: 12 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,3 +66,15 @@ make validate-dot # for dot files, requires GraphViz installed
make validate-wgsl # for WGSL shaders
make validate-hlsl # for HLSL shaders. Note: this Make target makes use of the "sh" shell. This is not the default shell in Windows.
```

## MSRV

The `naga` codebase's MSRV is 1.43. However some newer versions of our dependencies have newer MSRVs than that. Here are a list of all known MSRV breaking dependencies and the versions that hold to MSRV.

- `bitflags`: `>1.3` have an MSRV of 1.46. `<=1.2` has an MSRV of 1.43 or earlier.

If you want to use `naga` with `1.43` add the following to your Cargo.toml dependency list even if you don't use bitflags yourself:

```toml
bitflags = "<1.3"
```

0 comments on commit 800f910

Please sign in to comment.