internal: Workaround salsa cycles leaking #18760
Merged
+11
−6
Conversation
This file contains 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
Veykril
force-pushed
the
push-tkvlvvqyszrs
branch
from
e3ee0df to
ed8227c
Compare
davidbarsky
reviewed
Dec 26, 2024
| }; | ||
| } else if let Some(cycle) = panic.downcast_ref::<Cycle>() { | ||
| tracing::error!("Cycle propagated out of salsa! This is a bug: {cycle:?}"); | ||
| return Err(Cancelled::PropagatedPanic); |
There was a problem hiding this comment.
I'm rebasing my fork against this PR now, and I'm debating whether this the removal of #[non_exhaustive] in Salsa is necessary—could we return a different error here or is salsa::Cancelled load-bearing?
There was a problem hiding this comment.
At this point the value of cancelled doesn't really matter anymore I think so we could also return some other unit error type here (the caller merely wants to know whether cancellation occured)
Veykril
added a commit
to Veykril/rust
that referenced
this pull request
Jan 16, 2025
Veykril
added a commit
to Veykril/rust
that referenced
this pull request
Jan 16, 2025
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jan 20, 2025
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.
cc #18745