Skip to content

Conversation

@clarfonthey
Copy link
Contributor

@clarfonthey clarfonthey commented Dec 23, 2025

Includes clippy fixes for methods that were added in the meantime that could be used instead.

I also took the liberty of running taplo fmt in the repo to clean up the TOML files. This is now done in CI.

I've done my best to try and minimise the unsafe block bounds auto-added by fixes as well as possible, but there's a lot of code that needs to be annotated with safety comments anyway, so, some are left with very large unsafe blocks.

Additionally, I have made unreachable_pub now warn by default as agreed upon in #675. With a higher MSRV, we can avoid false positives.

@clarfonthey clarfonthey force-pushed the msrv-1.84 branch 2 times, most recently from 3c9b290 to 8c3980d Compare December 23, 2025 20:42
@clarfonthey clarfonthey force-pushed the msrv-1.84 branch 3 times, most recently from 33b2b90 to 0dbbb18 Compare December 23, 2025 20:58
@clarfonthey clarfonthey force-pushed the msrv-1.84 branch 2 times, most recently from 2e8e439 to 60cbe03 Compare December 23, 2025 21:50
@clarfonthey clarfonthey force-pushed the msrv-1.84 branch 4 times, most recently from 0aeba7d to ee9e7c3 Compare December 23, 2025 22:12
@clarfonthey
Copy link
Contributor Author

Side note: I hate that you can't lint code that's been cfg'd out. I know that this is nothing new, but it's frustrating that something as simple as unsafe-op-in-unsafe-fn requires downloading multiple builds of libstd, recompiling dependencies for multiple targets, and potentially even downloading separate linking tools for other targets all because of this limitation. I've done it for multiple different cases but this is just the latest one and I'm annoyed about it and going to vent about it here.

Thanks for coming to my talk.

@clarfonthey clarfonthey force-pushed the msrv-1.84 branch 3 times, most recently from 780b782 to 3581589 Compare December 24, 2025 00:34
@clarfonthey
Copy link
Contributor Author

I think at this point, I've implemented all major changes up to the MSRV that I think are important before merging. If I've missed any, please feel free to mention it, although as usual, no rush. I'm not going to have a proper computer to dev this for the next couple days, so, I'll get to any requests when I'm back home unless I happen to notice them before I go to bed tonight.

@Amanieu
Copy link
Member

Amanieu commented Dec 27, 2025

@cuviper Is RHEL still stuck on 1.84? Ideally we would like to directly upgrade to the 2024 edition with a MSRV of 1.85.

@cuviper
Copy link
Member

cuviper commented Dec 27, 2025

RHEL has 1.88 now.

@Amanieu
Copy link
Member

Amanieu commented Dec 27, 2025

In that case we should be able to just bump to 1.85 and the 2024 edition. It can be done in either this PR or a separate one.

@clarfonthey
Copy link
Contributor Author

As mentioned, with the unsafe fn lint fixed here, 1.85 is just a difference of cargo fmt, so, it's a quick fix. For the sake of avoiding more rebasing, though, I'll at least do it as a separate commit instead of modifying all of them.

@clarfonthey clarfonthey changed the title MSRV 1.84 MSRV 1.85, Edition 2024 Dec 28, 2025
cargo clippy --all --tests --features serde,rayon -- -D warnings
fi

if command -v taplo ; then
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Decided to make this an "optional" check in this script so that people don't need to necessarily have taplo installed to have the script pass, although it will still be enforced on CI, where it will be installed.

@clarfonthey
Copy link
Contributor Author

That should be everything!

@Amanieu Amanieu added this pull request to the merge queue Dec 29, 2025
Merged via the queue into rust-lang:master with commit 6efda58 Dec 29, 2025
25 checks passed
@clarfonthey clarfonthey deleted the msrv-1.84 branch December 29, 2025 21:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants