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 2024 and 1.85 #19236

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
Open

Rust 2024 and 1.85 #19236

wants to merge 13 commits into from

Conversation

BenjaminBrienen
Copy link
Contributor

No description provided.

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 26, 2025
@BenjaminBrienen
Copy link
Contributor Author

I hope this is more reviewable than the last one! I understand that this will not be merged until #18964 is landed. Please just block this until then. I will fix the merge conflicts afterward. :)

@BenjaminBrienen
Copy link
Contributor Author

This test fails for me, and I don't know why:

test tests::smoke_test_real_sysroot_cargo ... FAILED

failures:

---- tests::smoke_test_real_sysroot_cargo stdout ----

thread 'tests::smoke_test_real_sysroot_cargo' panicked at crates/base-db/src/input.rs:527:74:
no entry found for key

@ChayimFriedman2
Copy link
Contributor

It's not you. #19214.

@Veykril
Copy link
Member

Veykril commented Feb 27, 2025 •
edited
Loading

Gonna repeat myself just to be safe but this will have to land after #18964

Edit: Ah I see you raised that in a comment already, sorry :)

@BenjaminBrienen BenjaminBrienen force-pushed the rust-2024-and-1.85 branch 6 times, most recently from 3ced36d to 8379efd Compare March 4, 2025 21:31
@BenjaminBrienen
Copy link
Contributor Author

git rebase had a bad time with the imports, so I fixed it up in the last commit

@BenjaminBrienen
Copy link
Contributor Author

The CI error baffles me. Is that a bug in the action?

@lnicola
Copy link
Member

lnicola commented Mar 5, 2025

The new rustup that just came out has some breaking changes, but I don't see anything that would affect this. However, at:

https://github.com/rust-lang/rust-analyzer/actions/runs/13663331790/workflow?pr=19236#L70-L71

Can you try rustup +nightly component add rustfmt? If it works, we could also try to merge it into the command above as rustup toolchain install nightly --profile minimal --components rustfmt.

@lnicola lnicola mentioned this pull request Mar 5, 2025
Merged
@lnicola
Copy link
Member

lnicola commented Mar 5, 2025

I went down the second route in #19286.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ChayimFriedman2 ChayimFriedman2 ChayimFriedman2 requested changes

Requested changes must be addressed to merge this pull request.

Assignees
No one assigned
Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@BenjaminBrienen @ChayimFriedman2 @Veykril @lnicola @rustbot