fix SCIP panicking due to salsa not attaching#20735
Merged
Merged
Conversation
ChayimFriedman2
requested changes
Sep 24, 2025
ChayimFriedman2
left a comment
Contributor
There was a problem hiding this comment.
Please remove the test and the dependency. The change itself LGTM.
| test-utils.workspace = true | ||
| test-fixture.workspace = true | ||
| syntax-bridge.workspace = true | ||
| mktemp = "0.5" |
Contributor
There was a problem hiding this comment.
I don't think the dependency is worth the test. We also generally don't test r-a commands this way, by running them externally. Yes, this can be problems from this, but the cost of testing this is too high.
Contributor
Author
There was a problem hiding this comment.
That makes sense - I'll remove it.
Contributor
|
Please squash. |
d6d6316 to
01b2eff
Compare
Contributor
Author
|
squashed 👍 |
Member
|
changelog fixup #20329 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
On main, trying to run
rust-analyzer scip $(pwd) --output $(pwd)/index.scip(within any repo I've tried) results in the following panic:This PR simply attaches the salsa db before calling into any code that needs it (but also after anything else that attaches it so we don't get double-attaching panics).
I also added a test here to make sure we can do a full scip run with the smallest crate in this workspace (
edition), but that takes a while to run - significantly longer than all other tests (but I feel it's very useful since it would've caught this issue). On my machine, it's much faster to compile & run that specific test with--releasethan without (even including compile time), so maybe that's something that should be done to keep CI passing in a reasonable amount of time if we want to keep this test in?