Skip to content
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

Jump to bottom

rust-toolchain.toml: bump MSRV to 1.70.0 #8877

Merged
merged 11 commits into from Nov 25, 2023
Merged

rust-toolchain.toml: bump MSRV to 1.70.0 #8877

merged 11 commits into from Nov 25, 2023

Conversation

cole-h
Copy link
Contributor

@cole-h cole-h commented Nov 21, 2023

With Firefox 120 released on 21 November 2023, the MSRV is now 1.70.0.

According to https://firefox-source-docs.mozilla.org/writing-rust-code/update-policy.html (and after attempting to download Firefox myself), Firefox 120 has been released. Since helix follows Firefox's MSRV (https://github.com/helix-editor/helix/blob/47b6c4bc78d449e3586f28d26507bfc8fb8608e2/docs/CONTRIBUTING.md#minimum-stable-rust-version-msrv-policy), I bumped the MSRV to 1.70.0 in line with Firefox!

(The main thing I'm looking forward to is the sparse crates registry support added in 1.68.0.)

@cole-h
rust-toolchain.toml: bump MSRV to 1.70.0
a40ad3a 
With Firefox 120 released on 21 November 2023, the MSRV is now 1.70.0.
@cole-h
Copy link
Contributor Author

cole-h commented Nov 21, 2023

I also wonder if you'd be amenable to adding the rust-analyzer component to the toolchain components list... I've had to add it to the list locally in the past to get a rust-analyzer working, but maybe that's a problem with my system configuration.

@pascalkuthe
Copy link
Member

finally! We still want to wait till ubuntu updates but that is just a matter of time now.

I don't think we should include the rust-analyzer component, RA is backwards compatible (and using new version is preferable in every case, I always use nightly)

the-mikedavis
the-mikedavis reviewed Nov 21, 2023
View reviewed changes
Copy link
Member

@the-mikedavis the-mikedavis left a comment

Choose a reason for hiding this comment

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

For CI you'll want to update the old references to dtolnay/rust-toolchain@1.65 in .github/workflows/* to use 1.70 instead

@cole-h
Copy link
Contributor Author

cole-h commented Nov 21, 2023

Good catch. I also notice that there's a rust-version in helix-term/Cargo.toml -- should I bump that to 1.70 as well? It's currently 1.65.

@pascalkuthe
Copy link
Member

Yes

@archseer
Copy link
Member

There's also a couple of TODOs in the code to simplify a couple things once MSRV is high enough, I think a couple can be tackled now

@cole-h
Copy link
Contributor Author

cole-h commented Nov 21, 2023

Is that something you'd like me to handle in this PR, or do you want that to be a separate PR?

@pascalkuthe
Copy link
Member

We usually handle that in the MSRV bump PR

@cole-h
Copy link
Contributor Author

cole-h commented Nov 21, 2023 •
edited

OK, I think I got everything in my latest commits. (I just grepped for MSRV and 1\.\d\d and didn't find anything else in the Rust code.)

I didn't know what you would prefer for the checked math error handling in 44efc03, so I just used expect with the same message of Selection ranges cannot overlap (going off the comment above that block). I'll gladly implement a better approach, or even feel free to push directly to my branch if you don't want to deal with the back-and-forth.

@the-mikedavis
Copy link
Member

Looks like ubuntu has bumped to 1.70 if I'm reading their packages correctly: https://packages.ubuntu.com/search?suite=default&section=all&arch=any&keywords=rust-all&searchon=names

@pascalkuthe pascalkuthe merged commit 8b0ae3d into helix-editor:master Nov 25, 2023
6 checks passed
@cole-h cole-h deleted the bump-msrv branch November 25, 2023 17:18
@the-mikedavis the-mikedavis mentioned this pull request Nov 27, 2023
Merged
dgkf pushed a commit to dgkf/helix that referenced this pull request Jan 30, 2024
@cole-h @dgkf
bump MSRV to 1.70.0 (helix-editor#8877)
4078804 
* rust-toolchain.toml: bump MSRV to 1.70.0

With Firefox 120 released on 21 November 2023, the MSRV is now 1.70.0.

* Fix cargo fmt with Rust 1.70.0

* Fix cargo clippy with Rust 1.70.0

* Fix cargo doc with Rust 1.70.0

* rust-toolchain.toml: add clippy component

* .github: bump dtolnay/rust-toolchain to 1.70

* helix-term: bump rust-version to 1.70

* helix-view/gutter: use checked_ilog10 to count digits

* helix-core/syntax: use MAIN_SEPARATOR_STR constant

* helix-view/handlers/dap: use Display impl for displaying process spawn error

* WIP: helix-term/commands: use checked math to assert ranges cannot overlap
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@the-mikedavis the-mikedavis the-mikedavis approved these changes

@pascalkuthe pascalkuthe pascalkuthe approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@cole-h @pascalkuthe @archseer @the-mikedavis