Fix ICE in Definitions::create_def#99340
Merged
bors merged 1 commit intorust-lang:masterfrom Aug 1, 2022
Merged
Conversation
Contributor
|
Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @lcnr (or someone else) soon. Please see the contribution instructions for more information. |
This comment has been minimized.
This comment has been minimized.
klensy
reviewed
Jul 16, 2022
This comment has been minimized.
This comment has been minimized.
lcnr
reviewed
Jul 18, 2022
5d7200d to
6ac17f0
Compare
This comment has been minimized.
This comment has been minimized.
Contributor
|
thanks 👍 @bors r+ rollup squash |
Collaborator
|
📌 Commit b85c5f0417585cf77d8613a7d6d2e691da328aa5 has been approved by It is now in the queue for this repository. |
Contributor
Can't find exact PR, but recently r+ squash was tried and it didn't worked in rollup. |
b85c5f0 to
d9f28b7
Compare
Contributor
Author
|
I manually squashed the commits, could someone re-approve this? |
Contributor
|
@bors r+ rollup |
Collaborator
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Aug 1, 2022
…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#99340 (Fix ICE in Definitions::create_def) - rust-lang#99629 (Improve `cannot move out of` error message) - rust-lang#99864 (bootstrap: don't emit warn about duplicated deps with same/different features if some of sets actually empty) - rust-lang#99911 (Remove some uses of `guess_head_span`) - rust-lang#99976 (Make Rustdoc exit with correct error code when scraping examples from invalid files) - rust-lang#100003 (Improve size assertions.) - rust-lang#100012 (Avoid `Ty` to `String` conversions) - rust-lang#100020 (better error when python is not found in x - issue rust-lang#99648) Failed merges: - rust-lang#99994 (Replace `guess_head_span` with `opt_span`) r? `@ghost` `@rustbot` modify labels: rollup
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.
Debugimplementation forLocalDefIduses globalDefinitions. Normally it’s ok, but we can’t do it while holding a mutable reference toDefinitions, since it causes ICE or deadlock (depending on whetherparallel_compileris enabled).This PR effectively copies the
Debugimplementation into the problematic method. I don’t particularly love this solution (since it creates code duplication), but I don’t see any other options.This issue was discovered when running
rustdocwithRUSTDOC_LOG=traceon the following file:I’m not sure how to create a test for this behavior.