Skip to content

Conversation

compiler-errors
Copy link
Member

This return is needed so we don't call Ty::is_inhabited_from from a type with ty/ct vars in it.

Fixes #105981

@rustbot
Copy link
Collaborator

rustbot commented Dec 21, 2022

r? @cjgillot

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Dec 21, 2022
@tmiasko
Copy link
Contributor

tmiasko commented Dec 22, 2022

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Dec 22, 2022

📌 Commit 2f5334d has been approved by tmiasko

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 22, 2022
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
@matthiaskrgr
Copy link
Member

@bors r- failed in a rollup
#106031 (comment)

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 22, 2022
@compiler-errors
Copy link
Member 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.

@compiler-errors
Copy link
Member Author

Anyways, split up the test into two, so shouldn't need a re-review.

@bors r=tmiasko

@bors
Copy link
Collaborator

bors commented Dec 22, 2022

📌 Commit 51ba7b4 has been approved by tmiasko

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 22, 2022
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 bors merged commit 273fe60 into rust-lang:master Dec 23, 2022
@rustbot rustbot added this to the 1.68.0 milestone Dec 23, 2022
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.
@compiler-errors compiler-errors deleted the issue-105981 branch August 11, 2023 20:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

ice when running async in miri: const variables should not be hashed: Var(_#0c) with -Zdrop-tracking
6 participants