Fix panic when using analysis-stats #20777
Merged
+7
−7
Conversation
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
rustbot
added
the
S-waiting-on-review
|
That's my mistake in #20765, but the fix needed is much smaller: just shrink the scope of the |
itsjunetime
force-pushed
the
no_panic_analysis_stats
branch
from
6a2f08a to
10763b0
Compare
|
@ChayimFriedman2 I fixed that up, does it look good now? |
rustbot
removed
the
S-waiting-on-review
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
cargo xtask install --pgo crate@versionpanics due to some code paths trying to re-attach to the salsa database when it's already attached. To resolve that, I changed some parts of the code to not attach to the database when we already know we're attached.I'm not sure if this is the "correct" approach, but it seems to do the job for me. After this change, I was able to do all the following just fine:
cargo nextest runcargo build --release --features mimalloc --target $(rustc --print host-tuple) && cargo xtask install --server --mimalloc --proc-macro-server --pgo apache/[email protected](as an example crate)This PR is also probably better viewed without the whitespace changes - there's a good bit of indentation changes.