Skip to content

Commit 689cceb

Browse files
committed
Raise the MSRVto 1.51.0
Nix's code hasn't changed. However, Serde accidentally raised its MSRV to 1.51.0 in a patch release, due to a Cargo bug. They don't plan to change it back. Nix does not depend on Serde, but it's used by cargo-hack, which we build as part of our CI process. So we need to either raise our MSRV, or else install a separate toolchain during CI just to build cargo-hack. serde-rs/serde#2255
1 parent a10078f commit 689cceb

File tree

3 files changed

+9
-20
lines changed

3 files changed

+9
-20
lines changed

.cirrus.yml

+6-19
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ env:
99
RUSTDOCFLAGS: -D warnings
1010
TOOL: cargo
1111
# The MSRV
12-
TOOLCHAIN: 1.46.0
12+
TOOLCHAIN: 1.51.0
1313
ZFLAGS:
1414

1515
# Tests that don't require executing the build binaries
@@ -141,18 +141,18 @@ task:
141141
matrix:
142142
- name: Linux aarch64
143143
arm_container:
144-
image: rust:1.46
144+
image: rust:1.51
145145
env:
146146
RUSTFLAGS: --cfg graviton -D warnings
147147
TARGET: aarch64-unknown-linux-gnu
148148
- name: Linux x86_64
149149
container:
150-
image: rust:1.46
150+
image: rust:1.51
151151
env:
152152
TARGET: x86_64-unknown-linux-gnu
153153
- name: Linux x86_64 musl
154154
container:
155-
image: rust:1.46
155+
image: rust:1.51
156156
env:
157157
TARGET: x86_64-unknown-linux-musl
158158
setup_script:
@@ -178,7 +178,7 @@ task:
178178
# Tasks for cross-compiling, but no testing
179179
task:
180180
container:
181-
image: rust:1.46
181+
image: rust:1.51
182182
env:
183183
BUILD: check
184184
matrix:
@@ -208,27 +208,18 @@ task:
208208
- name: Illumos
209209
env:
210210
TARGET: x86_64-unknown-illumos
211-
# illumos toolchain isn't available via rustup until 1.50
212-
TOOLCHAIN: 1.50.0
213-
container:
214-
image: rust:1.50
215211
# Cross claims to support running tests on iOS, but it actually doesn't.
216212
# https://github.com/rust-embedded/cross/issues/535
217213
- name: iOS aarch64
218214
env:
219215
# cargo hack tries to invoke the iphonesimulator SDK for iOS
220216
NOHACK: 1
221217
TARGET: aarch64-apple-ios
222-
# Rustup only supports cross-building from arbitrary hosts for iOS at
223-
# 1.49.0 and above. Below that it's possible to cross-build from a macOS
224-
# host, but macOS VMs are more expensive than Linux VMs.
225-
TOOLCHAIN: 1.49.0
226218
- name: iOS x86_64
227219
env:
228220
# cargo hack tries to invoke the iphonesimulator SDK for iOS
229221
NOHACK: 1
230222
TARGET: x86_64-apple-ios
231-
TOOLCHAIN: 1.49.0
232223
# Cross testing on powerpc fails with "undefined reference to renameat2".
233224
# Perhaps cross is using too-old a version?
234225
- name: Linux powerpc
@@ -248,10 +239,6 @@ task:
248239
- name: macOS aarch64
249240
env:
250241
TARGET: aarch64-apple-darwin
251-
# macOS aarch64 toolchain isn't available via rustup until 1.49
252-
TOOLCHAIN: 1.49.0
253-
container:
254-
image: rust:1.49
255242
- name: NetBSD x86_64
256243
env:
257244
TARGET: x86_64-unknown-netbsd
@@ -265,7 +252,7 @@ task:
265252

266253
task:
267254
container:
268-
image: rust:1.46
255+
image: rust:1.51
269256
env:
270257
BUILD: check
271258
name: Redox x86_64

CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ This project adheres to [Semantic Versioning](https://semver.org/).
4343

4444
### Changed
4545

46+
- The MSRV is now 1.51.0
47+
([#TODO](https://github.com/nix-rust/nix/pull/TODO))
4648
- Rewrote the aio module. The new module:
4749
* Does more type checking at compile time rather than runtime.
4850
* Gives the caller control over whether and when to `Box` an aio operation.

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ Tier 3:
8989

9090
## Minimum Supported Rust Version (MSRV)
9191

92-
nix is supported on Rust 1.46.0 and higher. Its MSRV will not be
92+
nix is supported on Rust 1.51.0 and higher. Its MSRV will not be
9393
changed in the future without bumping the major or minor version.
9494

9595
## Contributing

0 commit comments

Comments
 (0)