-
Notifications
You must be signed in to change notification settings - Fork 672
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.
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
Bump MSRV to 1.63 for I/O safety #1862
Conversation
d96ea77
to
703f946
Compare
Needs a rebase. |
Is there any way we can use |
Some clippy lints I applied were false positives that needed the 2021 edition, so I bumped us up to that. |
#1861 should be merged first because clippy changed stuff in the code we're deleting. |
85fd3a3
to
e425507
Compare
Unrelated CI failure |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It looks like the OSX build failed because it tried to download cargo-hack exactly as that project uploaded a new release.
.cirrus.yml
Outdated
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 |
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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.
.cirrus.yml
Outdated
@@ -9,7 +9,7 @@ env: | |||
RUSTDOCFLAGS: -D warnings | |||
TOOL: cargo | |||
# The MSRV | |||
TOOLCHAIN: 1.56.1 | |||
TOOLCHAIN: 1.63 |
There was a problem hiding this comment.
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.
TOOLCHAIN: 1.63 | |
TOOLCHAIN: 1.63.0 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sounds good, fixed.
6c1c5f8
to
5ea76d2
Compare
src/sys/mman.rs
Outdated
); | ||
|
||
let ret = libc::mmap(ptr, length.into(), prot.bits(), flags.bits(), fd, offset); | ||
let ptr = |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There's more formatting changes like this mixed in with content changes. Can you please move them into separate commits?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I thought this was due to the edition bump, but it looks like this is because I'm on nightly? When I run a cargo fmt on master this stuff changes. Created #1909
1909: More annoying formatting changes r=asomers a=SUPERCILEX Extracted from #1862 Co-authored-by: Alex Saveau <[email protected]>
CHANGELOG.md
Outdated
@@ -73,6 +73,8 @@ This project adheres to [Semantic Versioning](https://semver.org/). | |||
([#1870](https://github.com/nix-rust/nix/pull/1870)) | |||
- The `length` argument of `sys::mman::mmap` is now of type `NonZeroUsize`. | |||
([#1873](https://github.com/nix-rust/nix/pull/1873)) | |||
- The MSRV is now 1.63 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Arg, you need to move this part to the top of the file.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Shucks, fixed.
Signed-off-by: Alex Saveau <[email protected]>
Signed-off-by: Alex Saveau <[email protected]>
Signed-off-by: Alex Saveau <[email protected]>
Signed-off-by: Alex Saveau <[email protected]>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
bors r+
Prep for #1750