Rollup of 7 pull requests #78371

Dylan-DPC-zz · 2020-10-25T20:25:24Z

Successful merges:

Tweak match arm semicolon removal suggestion to account for futures #78214 (Tweak match arm semicolon removal suggestion to account for futures)
Capture output from threads spawned in tests #78227 (Capture output from threads spawned in tests)
Fix #78192 #78247 (Fix InstCombine introduces an incorrect use of a local after its storage has ended #78192)
Do not try to report on closures to avoid ICE #78268 (Do not try to report on closures to avoid ICE)
ensure that statics are inhabited #78324 (ensure that statics are inhabited)
Make some functions private that don't have to be public #78348 (Make some functions private that don't have to be public)
Move "mutable thing in const" check from interning to validity #78351 (Move "mutable thing in const" check from interning to validity)

Failed merges:

r? @ghost

Fixes rust-lang#78192

Fixes rust-lang#42474.

…stions

and improve a comment a bit

Co-authored-by: BlackHoleFox <blackholefoxdev@gmail.com>

…ner; we no longer need the ignore_interior_mut_in_const hack

Tweak match arm semicolon removal suggestion to account for futures * Tweak and extend "use `.await`" suggestions * Suggest removal of semicolon on prior match arm * Account for `impl Future` when suggesting semicolon removal * Silence some errors when encountering `await foo()?` as can't be certain what the intent was *Thanks to https://twitter.com/a_hoverbear/status/1318960787105353728 for pointing this out!*

…, r=m-ou-se Capture output from threads spawned in tests This is revival of rust-lang#75172. Original text: > Fixes rust-lang#42474. > > r? `@dtolnay` since you expressed interest in this, but feel free to redirect if you aren't the right person anymore. --- Closes rust-lang#75172.

Fix rust-lang#78192 Check which places are marked dead. Fixes rust-lang#78192

Do not try to report on closures to avoid ICE Fixes rust-lang#78262

@oli-obk

…-obk ensure that statics are inhabited Fixes rust-lang#74840 r? @oli-obk

@GuillaumeGomez

Make some functions private that don't have to be public r? @GuillaumeGomez

@oli-obk

…i-obk Move "mutable thing in const" check from interning to validity This moves the check for mutable things (such as `UnsafeCell` or `&mut`) in a`const` from interning to validity. That means we can give more targeted error messages (pointing out *where* the problem lies), and we can simplify interning a bit. Also fix the interning mode used for promoteds in statics. r? @oli-obk

Dylan-DPC-zz · 2020-10-25T20:26:22Z

@bors r+ rollup=never p=5

bors · 2020-10-25T20:26:26Z

📌 Commit 04fe7fa has been approved by Dylan-DPC

bors · 2020-10-25T22:28:53Z

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

git checkout rollup-bmo593r (switch to your branch)
git fetch upstream master (retrieve the latest master)
git rebase upstream/master -p (rebase on top of it)
Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
git push self rollup-bmo593r --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

Removing src/test/ui/async-await/suggest-missing-await.fixed
Auto-merging compiler/rustc_mir/src/interpret/validity.rs
Auto-merging compiler/rustc_mir/src/interpret/intern.rs
CONFLICT (content): Merge conflict in compiler/rustc_mir/src/interpret/intern.rs
Automatic merge failed; fix conflicts and then commit the result.

bors · 2020-10-25T23:01:12Z

☔ The latest upstream changes (presumably #78179) made this pull request unmergeable. Please resolve the merge conflicts.

Note that reviewers usually do not review pull requests until merge conflicts are resolved! Once you resolve the conflicts, you should change the labels applied by bors to indicate that your PR is ready for review. Post this as a comment to change the labels:

@rustbot modify labels: +S-waiting-on-review -S-waiting-on-author

simonvandel and others added 30 commits October 22, 2020 22:23

Check which places are dead

57d01a9

Fixes rust-lang#78192

Capture output from threads spawned in tests

d0d0e78

Fixes rust-lang#42474.

Only load LOCAL_STREAMS if they are being used

db15596

Tweak "use .await" suggestion

86df903

Suggest semicolon removal on prior match arm

a4ee3ca

Account for possible boxable impl Future in semicolon removal sugge…

671d7c4

…stions

Review comments: use newtype instead of bool

62ba365

Silence unnecessary await foo? knock-down error

3a0227b

Add test case for different impl Futures

1829b4a

Add more .await suggestions on E0308

c548511

Suggest semicolon removal and boxing when appropriate

f5d7443

ensure that statics are inhabited

1333206

Miri engine validity check: simplify code with 'matches!'

2585124

and improve a comment a bit

Miri engine interning: improve comments, and entirely skip ZST

d8ec83f

ensure we intern all promoteds as InternKind::Promoted

778ddff

fix typo

5d62492

Co-authored-by: BlackHoleFox <blackholefoxdev@gmail.com>

move UnsafeCell-in-const check from interning to validation

849c929

Do not try to report on closures to avoid ICE

7b4c397

Test with NLL explicitly

4ec396e

Make some functions private that don't have to be public

e218380

move &mut-in-const check from interning to validation

341170d

interning cleanup: we no longer need to distinguish Const and ConstIn…

7c7b90d

…ner; we no longer need the ignore_interior_mut_in_const hack

explain why interning is not as trivial as it might seem

db01d97

also test non-extern uninhabited statics

3bd5cc9

Rollup merge of rust-lang#78247 - simonvandel:fix-78192, r=oli-obk

9fe1de1

Fix rust-lang#78192 Check which places are marked dead. Fixes rust-lang#78192

Rollup merge of rust-lang#78268 - JohnTitor:issue-78262, r=estebank

93b4abf

Do not try to report on closures to avoid ICE Fixes rust-lang#78262

Rollup merge of rust-lang#78324 - RalfJung:uninhabited-statics, r=oli…

da10bd8

…-obk ensure that statics are inhabited Fixes rust-lang#74840 r? @oli-obk

Rollup merge of rust-lang#78348 - jyn514:pub-crate, r=GuillaumeGomez

9c08ed0

Make some functions private that don't have to be public r? @GuillaumeGomez

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Oct 25, 2020

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 Oct 25, 2020

Dylan-DPC-zz closed this Oct 25, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 7 pull requests #78371

Rollup of 7 pull requests #78371

Dylan-DPC-zz commented Oct 25, 2020

Dylan-DPC-zz commented Oct 25, 2020

bors commented Oct 25, 2020

bors commented Oct 25, 2020

bors commented Oct 25, 2020

Rollup of 7 pull requests #78371

Rollup of 7 pull requests #78371

Conversation

Dylan-DPC-zz commented Oct 25, 2020

Dylan-DPC-zz commented Oct 25, 2020

bors commented Oct 25, 2020

bors commented Oct 25, 2020

bors commented Oct 25, 2020