Skip to content

Commit 5495bbc

Browse files
committed
Fix the build with bitflags-1.3.0 and newer
Bitflags raised its MSRV in a minor version, forcing all consumers to follow suit. Fixes #1491
1 parent e9ea844 commit 5495bbc

File tree

4 files changed

+12
-9
lines changed

4 files changed

+12
-9
lines changed

.cirrus.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ task:
1515
image: freebsd-11-4-release-amd64
1616
setup_script:
1717
- fetch https://sh.rustup.rs -o rustup.sh
18-
- sh rustup.sh -y --profile=minimal --default-toolchain 1.41.0
18+
- sh rustup.sh -y --profile=minimal --default-toolchain 1.46.0
1919
- $HOME/.cargo/bin/rustup target add i686-unknown-freebsd
2020
amd64_test_script:
2121
- . $HOME/.cargo/env
@@ -46,7 +46,7 @@ task:
4646
image: catalina-xcode
4747
setup_script:
4848
- curl --proto '=https' --tlsv1.2 -sSf -o rustup.sh https://sh.rustup.rs
49-
- sh rustup.sh -y --profile=minimal --default-toolchain 1.41.0
49+
- sh rustup.sh -y --profile=minimal --default-toolchain 1.46.0
5050
- . $HOME/.cargo/env
5151
- bash ci/install.sh
5252
script:
@@ -101,7 +101,7 @@ task:
101101
setup_script:
102102
- mkdir /tmp/home
103103
- curl --proto '=https' --tlsv1.2 -sSf -o rustup.sh https://sh.rustup.rs
104-
- sh rustup.sh -y --profile=minimal --default-toolchain 1.41.0
104+
- sh rustup.sh -y --profile=minimal --default-toolchain 1.46.0
105105
- . $HOME/.cargo/env
106106
- bash ci/install.sh
107107
script:
@@ -119,13 +119,13 @@ task:
119119
- name: Linux x86_64
120120
env:
121121
TARGET: x86_64-unknown-linux-gnu
122-
TOOLCHAIN: 1.41.0
122+
TOOLCHAIN: 1.46.0
123123
- name: Linux x86_64 musl
124124
env:
125125
TARGET: x86_64-unknown-linux-musl
126-
TOOLCHAIN: 1.41.0
126+
TOOLCHAIN: 1.46.0
127127
container:
128-
image: rust:1.41
128+
image: rust:1.46
129129
setup_script:
130130
- rustup toolchain install $TOOLCHAIN
131131
- rustup target add --toolchain $TOOLCHAIN $TARGET
@@ -173,7 +173,7 @@ task:
173173
env:
174174
TARGET: x86_64-fuchsia
175175
container:
176-
image: rust:1.41
176+
image: rust:1.46
177177
setup_script:
178178
- rustup target add $TARGET
179179
script:

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,9 @@ This project adheres to [Semantic Versioning](https://semver.org/).
5050
where it previously would've had undefined behavior.
5151
(#[1484](https://github.com/nix-rust/nix/pull/1484))
5252

53+
- Minimum supported Rust version is now 1.46.0.
54+
([#1492](https://github.com/nix-rust/nix/pull/1492))
55+
5356
### Fixed
5457

5558
- Added more errno definitions for better backwards compatibility with

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ targets = [
2626

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

3232
[target.'cfg(not(target_os = "redox"))'.dependencies]

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ Tier 3:
8787

8888
## Usage
8989

90-
`nix` requires Rust 1.41.0 or newer.
90+
`nix` requires Rust 1.46.0 or newer.
9191

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

0 commit comments

Comments
 (0)