Skip to content

Commit

Permalink
Fix the build with bitflags-1.3.0 and newer
Browse files Browse the repository at this point in the history
Bitflags raised its MSRV in a minor version, forcing all consumers to
follow suit.

Fixes #1491
  • Loading branch information
asomers committed Aug 13, 2021
1 parent e9ea844 commit 269b8f8
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 9 deletions.
14 changes: 7 additions & 7 deletions .cirrus.yml
Expand Up @@ -15,7 +15,7 @@ task:
image: freebsd-11-4-release-amd64
setup_script:
- fetch https://sh.rustup.rs -o rustup.sh
- sh rustup.sh -y --profile=minimal --default-toolchain 1.41.0
- sh rustup.sh -y --profile=minimal --default-toolchain 1.46.0
- $HOME/.cargo/bin/rustup target add i686-unknown-freebsd
amd64_test_script:
- . $HOME/.cargo/env
Expand Down Expand Up @@ -46,7 +46,7 @@ task:
image: catalina-xcode
setup_script:
- curl --proto '=https' --tlsv1.2 -sSf -o rustup.sh https://sh.rustup.rs
- sh rustup.sh -y --profile=minimal --default-toolchain 1.41.0
- sh rustup.sh -y --profile=minimal --default-toolchain 1.46.0
- . $HOME/.cargo/env
- bash ci/install.sh
script:
Expand Down Expand Up @@ -101,7 +101,7 @@ task:
setup_script:
- mkdir /tmp/home
- curl --proto '=https' --tlsv1.2 -sSf -o rustup.sh https://sh.rustup.rs
- sh rustup.sh -y --profile=minimal --default-toolchain 1.41.0
- sh rustup.sh -y --profile=minimal --default-toolchain 1.46.0
- . $HOME/.cargo/env
- bash ci/install.sh
script:
Expand All @@ -119,13 +119,13 @@ task:
- name: Linux x86_64
env:
TARGET: x86_64-unknown-linux-gnu
TOOLCHAIN: 1.41.0
TOOLCHAIN: 1.46.0
- name: Linux x86_64 musl
env:
TARGET: x86_64-unknown-linux-musl
TOOLCHAIN: 1.41.0
TOOLCHAIN: 1.46.0
container:
image: rust:1.41
image: rust:1.46
setup_script:
- rustup toolchain install $TOOLCHAIN
- rustup target add --toolchain $TOOLCHAIN $TARGET
Expand Down Expand Up @@ -173,7 +173,7 @@ task:
env:
TARGET: x86_64-fuchsia
container:
image: rust:1.41
image: rust:1.46
setup_script:
- rustup target add $TARGET
script:
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Expand Up @@ -50,6 +50,9 @@ This project adheres to [Semantic Versioning](https://semver.org/).
where it previously would've had undefined behavior.
(#[1484](https://github.com/nix-rust/nix/pull/1484))

- Minimum supported Rust version is now 1.46.0.
([#TODO](https://github.com/nix-rust/nix/pull/TODO))

### Fixed

- Added more errno definitions for better backwards compatibility with
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Expand Up @@ -26,7 +26,7 @@ targets = [

[dependencies]
libc = { git = "https://github.com/rust-lang/libc", rev = "f5e31f208", features = [ "extra_traits" ] }
bitflags = "1.1"
bitflags = "1.3.1"
cfg-if = "1.0"

[target.'cfg(not(target_os = "redox"))'.dependencies]
Expand Down
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -87,7 +87,7 @@ Tier 3:

## Usage

`nix` requires Rust 1.41.0 or newer.
`nix` requires Rust 1.46.0 or newer.

To use `nix`, add this to your `Cargo.toml`:

Expand Down

0 comments on commit 269b8f8

Please sign in to comment.