Skip to content

Bump MSRV to 1.63 for I/O safety #1862

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bors merged 4 commits into from
Dec 4, 2022
Merged

Bump MSRV to 1.63 for I/O safety #1862

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1f68cf6
Bump MSRV to 1.63 for I/O safety
SUPERCILEX Nov 13, 2022
e2ff9d5
Bump the edition since why not
SUPERCILEX Dec 3, 2022
fb80246
Fix clippy lints
SUPERCILEX Dec 3, 2022
bc2b023
Tweak cirrus rust versions
SUPERCILEX Dec 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Bump MSRV to 1.63 for I/O safety 
Signed-off-by: Alex Saveau <[email protected]>
  • Loading branch information
@SUPERCILEX
SUPERCILEX committed Dec 4, 2022
commit 1f68cf663360cf8ce299ff1ea613f699a05f65b3
15 changes: 8 additions & 7 deletions .cirrus.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ env:
RUSTDOCFLAGS: -D warnings
TOOL: cargo
# The MSRV
TOOLCHAIN: 1.56.1
TOOLCHAIN: 1.63
Copy link
Member

@asomers asomers Dec 4, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Make this change and I don't think you'll need to reinstall the toolchain on line 159 below.

Suggested change
TOOLCHAIN: 1.63
TOOLCHAIN: 1.63.0

Copy link
Contributor Author

@SUPERCILEX SUPERCILEX Dec 4, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds good, fixed.

ZFLAGS:

# Tests that don't require executing the build binaries
Expand Down Expand Up @@ -140,23 +140,24 @@ task:
matrix:
- name: Linux aarch64
arm_container:
image: rust:1.56
image: rust:1.63
env:
RUSTFLAGS: --cfg graviton -D warnings
TARGET: aarch64-unknown-linux-gnu
- name: Linux x86_64
container:
image: rust:1.56
image: rust:1.63
env:
TARGET: x86_64-unknown-linux-gnu
- name: Linux x86_64 musl
container:
image: rust:1.56
image: rust:1.63
env:
TARGET: x86_64-unknown-linux-musl
setup_script:
- rustup target add $TARGET
- rustup component add clippy
- rustup toolchain install $TOOLCHAIN --profile minimal --target $TARGET
Copy link
Member

@asomers asomers Dec 3, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this step necessary?

Copy link
Contributor Author

@SUPERCILEX SUPERCILEX Dec 4, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I copied this from the other setup_script blocks. If you remove this I'm pretty sure the build fails with a wrong rust version error.

Copy link
Member

@asomers asomers Dec 4, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And yet the old version didn't fail. I think this section is masking some other problem.

- rustup component add --toolchain $TOOLCHAIN clippy
<< : *TEST
before_cache_script: rm -rf $CARGO_HOME/registry/index

Expand All @@ -176,7 +177,7 @@ task:
# Tasks for cross-compiling, but no testing
task:
container:
image: rust:1.56
image: rust:1.63
env:
BUILD: check
HOST: x86_64-unknown-linux-gnu
Expand Down Expand Up @@ -250,7 +251,7 @@ task:

task:
container:
image: rust:1.56
image: rust:1.63
env:
BUILD: check
name: Redox x86_64
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ This project adheres to [Semantic Versioning](https://semver.org/).
(#[1662](https://github.com/nix-rust/nix/pull/1662))

### Changed

- The MSRV is now 1.63
([#1862](https://github.com/nix-rust/nix/pull/1862))

### Fixed
### Removed

Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "nix"
description = "Rust friendly bindings to *nix APIs"
edition = "2018"
version = "0.26.1"
rust-version = "1.56"
rust-version = "1.63"
authors = ["The nix-rust Project Developers"]
repository = "https://github.com/nix-rust/nix"
license = "MIT"
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ Tier 3:

## Minimum Supported Rust Version (MSRV)

nix is supported on Rust 1.56.1 and higher. Its MSRV will not be
nix is supported on Rust 1.63 and higher. Its MSRV will not be
changed in the future without bumping the major or minor version.

## Contributing
Expand Down