Add a missing early return in drop tracking handle_uninhabited_return
#105983
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
|
r? @cjgillot (rustbot has picked a reviewer for you, use r? to override) |
rustbot
added
S-waiting-on-review
|
@bors r+ rollup |
bors
added
S-waiting-on-bors
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Dec 22, 2022
…iasko Add a missing early return in drop tracking `handle_uninhabited_return` This return is needed so we don't call `Ty::is_inhabited_from` from a type with ty/ct vars in it. Fixes rust-lang#105981
|
@bors r- failed in a rollup |
bors
added
S-waiting-on-author
|
Oh, huh, seems like we don't support incremental + revisions well in standard (non-incremental) UI tests since they can race and use the same incremental directory. |
|
Anyways, split up the test into two, so shouldn't need a re-review. @bors r=tmiasko |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Dec 22, 2022
…iaskrgr Rollup of 6 pull requests Successful merges: - rust-lang#105567 (KCFI test: Also support LLVM 16 output) - rust-lang#105847 (Ensure param-env is const before calling `eval_to_valtree`) - rust-lang#105983 (Add a missing early return in drop tracking `handle_uninhabited_return`) - rust-lang#106027 (rustdoc: simplify CSS and DOM for more-scraped-examples) - rust-lang#106035 (Migrate search tab title color to CSS variable) - rust-lang#106037 (Add regression test for rust-lang#94293) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Dec 23, 2022
…r=Mark-Simulacrum Take revision into account in non-incremental-mode `// incremental` tests A UI test I added in rust-lang#105983 confusingly [failed](rust-lang#106031 (comment)) in a merge because two different revisions raced with each other for the same incremental directory for a (non-incremental-mode, i.e. `src/test/ui`) UI test. Let's take the revision name into account when generating an incremental directory so that other UI tests that combine `// incremental` and `// revisions` won't race and cause possible flakiness in CI.
Aaron1011
pushed a commit
to Aaron1011/rust
that referenced
this pull request
Jan 6, 2023
…iasko Add a missing early return in drop tracking `handle_uninhabited_return` This return is needed so we don't call `Ty::is_inhabited_from` from a type with ty/ct vars in it. Fixes rust-lang#105981
Aaron1011
pushed a commit
to Aaron1011/rust
that referenced
this pull request
Jan 6, 2023
…iaskrgr Rollup of 6 pull requests Successful merges: - rust-lang#105567 (KCFI test: Also support LLVM 16 output) - rust-lang#105847 (Ensure param-env is const before calling `eval_to_valtree`) - rust-lang#105983 (Add a missing early return in drop tracking `handle_uninhabited_return`) - rust-lang#106027 (rustdoc: simplify CSS and DOM for more-scraped-examples) - rust-lang#106035 (Migrate search tab title color to CSS variable) - rust-lang#106037 (Add regression test for rust-lang#94293) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Aaron1011
pushed a commit
to Aaron1011/rust
that referenced
this pull request
Jan 6, 2023
…r=Mark-Simulacrum Take revision into account in non-incremental-mode `// incremental` tests A UI test I added in rust-lang#105983 confusingly [failed](rust-lang#106031 (comment)) in a merge because two different revisions raced with each other for the same incremental directory for a (non-incremental-mode, i.e. `src/test/ui`) UI test. Let's take the revision name into account when generating an incremental directory so that other UI tests that combine `// incremental` and `// revisions` won't race and cause possible flakiness in CI.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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.
This return is needed so we don't call
Ty::is_inhabited_fromfrom a type with ty/ct vars in it.Fixes #105981