Rollup of 5 pull requests #99169

Dylan-DPC · 2022-07-12T06:27:35Z

Successful merges:

Pull Derefer before ElaborateDrops #98145 (Pull Derefer before ElaborateDrops)
Fix last let_chains blocker #98633 (Fix last let_chains blocker)
Suggest adding a missing zero to a floating point number #98972 (Suggest adding a missing zero to a floating point number)
Some more EarlyBinder cleanups #99038 (Some more EarlyBinder cleanups)
use PlaceRef::iter_projections to fix old FIXME #99154 (use PlaceRef::iter_projections to fix old FIXME)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

I added this function in 53481a5

Pull Derefer before ElaborateDrops _Follow up work to rust-lang#97025 rust-lang#96549 rust-lang#96116 rust-lang#95887 #95649_ This moves `Derefer` before `ElaborateDrops` and creates a new `Rvalue` called `VirtualRef` that allows us to bypass many constraints for `DerefTemp`. r? `@oli-obk`

…stebank Fix last `let_chains` blocker In order to forbid things like `let x = (let y = 1);` or `if let a = 1 && { let x = let y = 1; } {}`, the parser **HAS** to know the context of `let`. This context thing is not a surprise in the parser because you can see **a lot** of ad hoc fixes mixing parsing logic with validation logic creating code that looks more like spaghetti with tomato sauce. To make things even greater, a new ad hoc fix was added to only allow `let`s in a valid `let_chains` context by checking the previously processed token. This was the only solution I could think of and believe me, I thought about it for a long time 👍 In the long term, it should be preferable to segregate different responsibilities or create a more robust and cleaner parser framework. cc rust-lang#94927 cc rust-lang#53667

…-to-floating-point-number, r=compiler-errors Suggest adding a missing zero to a floating point number fixes rust-lang#98836

Some more `EarlyBinder` cleanups First commit has a couple unrelated cleanups, but otherwise each commit is self-explanatory r? rust-lang/types

use PlaceRef::iter_projections to fix old FIXME I added this function in 53481a5

Dylan-DPC · 2022-07-12T06:38:56Z

@bors r+ rollup=never p=5

bors · 2022-07-12T06:38:58Z

📌 Commit b7d42d6 has been approved by Dylan-DPC

It is now in the queue for this repository.

bors · 2022-07-12T06:39:11Z

⌛ Testing commit b7d42d6 with merge 1670b0599ae478b541f9b1d74c352aeb9bb573bb...

rust-log-analyzer · 2022-07-12T06:59:06Z

The job test-various failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

test [ui] src/test/ui/type/type-unsatisfiable.rs#usage ... ok
test [ui] src/test/ui/type/type-unsatisfiable.rs#lib ... ok
test [ui] src/test/ui/typeck/call-block.rs ... ok
test [ui] src/test/ui/typeck/autoderef-with-param-env-error.rs ... ok
test [ui] src/test/ui/typeck/do-not-suggest-adding-missing-zero-to-floating-point-number.rs ... ok
test [ui] src/test/ui/typeck/issue-10401.rs ... ok
test [ui] src/test/ui/typeck/deref-multi.rs ... ok
test [ui] src/test/ui/typeck/explain_clone_autoref.rs ... ok
test [ui] src/test/ui/typeck/issue-13853-2.rs ... ok
---
test [ui] src/test/ui/typeck/typeck-default-trait-impl-negation-send.rs ... ok
test [ui] src/test/ui/typeck/remove-extra-argument.rs ... ok
test [ui] src/test/ui/typeck/typeck-default-trait-impl-send-param.rs ... ok
test [ui] src/test/ui/typeck/return_type_containing_closure.rs ... ok
test [ui] src/test/ui/typeck/suggest-adding-missing-zero-to-floating-point-number.rs ... ok
test [ui] src/test/ui/typeck/typeck-unsafe-always-share.rs ... ok
test [ui] src/test/ui/typeck/typeck-default-trait-impl-assoc-type.rs ... ok
test [ui] src/test/ui/typeck/typeck-default-trait-impl-cross-crate-coherence.rs ... ok
test [ui] src/test/ui/typeck/typeck_type_placeholder_item_help.rs ... ok
---

failures:
Some tests failed in compiletest suite=mir-opt mode=mir-opt host=x86_64-unknown-linux-gnu target=wasm32-unknown-unknown

---- [mir-opt] src/test/mir-opt/derefer_complex_case.rs stdout ----
33                                            // + span: $DIR/derefer_complex_case.rs:4:17: 4:26
34                                            // + literal: Const { ty: &[i32; 2], val: Unevaluated(main, [], Some(promoted[0])) }
35           _2 = &(*_14);                    // scope 0 at $DIR/derefer_complex_case.rs:4:17: 4:26
-           _1 = <&[i32; 2] as IntoIterator>::into_iter(move _2) -> bb1; // scope 0 at $DIR/derefer_complex_case.rs:4:17: 4:26
+           _1 = <&[i32; 2] as IntoIterator>::into_iter(move _2) -> [return: bb1, unwind: bb8]; // scope 0 at $DIR/derefer_complex_case.rs:4:17: 4:26
37                                            // mir::Constant
38                                            // + span: $DIR/derefer_complex_case.rs:4:17: 4:26
39                                            // + literal: Const { ty: fn(&[i32; 2]) -> <&[i32; 2] as IntoIterator>::IntoIter {<&[i32; 2] as IntoIterator>::into_iter}, val: Value(<ZST>) }

53           StorageLive(_9);                 // scope 1 at $DIR/derefer_complex_case.rs:4:17: 4:26
54           _9 = &mut _4;                    // scope 1 at $DIR/derefer_complex_case.rs:4:17: 4:26
55           _8 = &mut (*_9);                 // scope 1 at $DIR/derefer_complex_case.rs:4:17: 4:26
-           _7 = <std::slice::Iter<i32> as Iterator>::next(move _8) -> bb3; // scope 1 at $DIR/derefer_complex_case.rs:4:17: 4:26
+           _7 = <std::slice::Iter<i32> as Iterator>::next(move _8) -> [return: bb3, unwind: bb8]; // scope 1 at $DIR/derefer_complex_case.rs:4:17: 4:26
57                                            // mir::Constant
58                                            // + span: $DIR/derefer_complex_case.rs:4:17: 4:26
59                                            // + literal: Const { ty: for<'r> fn(&'r mut std::slice::Iter<i32>) -> Option<<std::slice::Iter<i32> as Iterator>::Item> {<std::slice::Iter<i32> as Iterator>::next}, val: Value(<ZST>) }

74 +         StorageDead(_15);                // scope 2 at $DIR/derefer_complex_case.rs:4:34: 4:37
75           StorageLive(_13);                // scope 2 at $DIR/derefer_complex_case.rs:4:34: 4:37
76           _13 = _12;                       // scope 2 at $DIR/derefer_complex_case.rs:4:34: 4:37
-           _6 = std::mem::drop::<i32>(move _13) -> bb7; // scope 2 at $DIR/derefer_complex_case.rs:4:29: 4:38
+           _6 = std::mem::drop::<i32>(move _13) -> [return: bb7, unwind: bb8]; // scope 2 at $DIR/derefer_complex_case.rs:4:29: 4:38
78                                            // mir::Constant
79                                            // + span: $DIR/derefer_complex_case.rs:4:29: 4:33
80                                            // + literal: Const { ty: fn(i32) {std::mem::drop::<i32>}, val: Value(<ZST>) }

102           StorageDead(_6);                 // scope 1 at $DIR/derefer_complex_case.rs:4:39: 4:40
103           _5 = const ();                   // scope 1 at $DIR/derefer_complex_case.rs:4:5: 4:40
104           goto -> bb2;                     // scope 1 at $DIR/derefer_complex_case.rs:4:5: 4:40
- +     }
- + 
- +     bb8 (cleanup): {
- +         resume;                          // scope 0 at $DIR/derefer_complex_case.rs:3:1: 5:2
+   
+   
+       bb8 (cleanup): {
+           resume;                          // scope 0 at $DIR/derefer_complex_case.rs:3:1: 5:2
110   }
111   


thread '[mir-opt] src/test/mir-opt/derefer_complex_case.rs' panicked at 'Actual MIR output differs from expected MIR output /checkout/src/test/mir-opt/derefer_complex_case.main.Derefer.diff', src/tools/compiletest/src/runtest.rs:3466:25

---- [mir-opt] src/test/mir-opt/derefer_terminator_test.rs stdout ----
30   
31       bb0: {
31       bb0: {
32           StorageLive(_1);                 // scope 0 at $DIR/derefer_terminator_test.rs:3:9: 3:10
-           _1 = foo() -> bb1;               // scope 0 at $DIR/derefer_terminator_test.rs:3:13: 3:18
+           _1 = foo() -> [return: bb1, unwind: bb6]; // scope 0 at $DIR/derefer_terminator_test.rs:3:13: 3:18
34                                            // mir::Constant
35                                            // + span: $DIR/derefer_terminator_test.rs:3:13: 3:16
36                                            // + literal: Const { ty: fn() -> bool {foo}, val: Value(<ZST>) }
38   
39       bb1: {
39       bb1: {
40           StorageLive(_2);                 // scope 1 at $DIR/derefer_terminator_test.rs:4:9: 4:10
-           _2 = foo() -> bb2;               // scope 1 at $DIR/derefer_terminator_test.rs:4:13: 4:18
+           _2 = foo() -> [return: bb2, unwind: bb6]; // scope 1 at $DIR/derefer_terminator_test.rs:4:13: 4:18
42                                            // mir::Constant
43                                            // + span: $DIR/derefer_terminator_test.rs:4:13: 4:16
44                                            // + literal: Const { ty: fn() -> bool {foo}, val: Value(<ZST>) }

94           StorageDead(_2);                 // scope 1 at $DIR/derefer_terminator_test.rs:10:1: 10:2
95           StorageDead(_1);                 // scope 0 at $DIR/derefer_terminator_test.rs:10:1: 10:2
96           return;                          // scope 0 at $DIR/derefer_terminator_test.rs:10:2: 10:2
- +     }
- + 
- +     bb6 (cleanup): {
- +         resume;                          // scope 0 at $DIR/derefer_terminator_test.rs:2:1: 10:2
+   
+   
+       bb6 (cleanup): {
+           resume;                          // scope 0 at $DIR/derefer_terminator_test.rs:2:1: 10:2
102   }
103   


thread '[mir-opt] src/test/mir-opt/derefer_terminator_test.rs' panicked at 'Actual MIR output differs from expected MIR output /checkout/src/test/mir-opt/derefer_terminator_test.main.Derefer.diff', src/tools/compiletest/src/runtest.rs:3466:25

failures:
    [mir-opt] src/test/mir-opt/derefer_complex_case.rs
    [mir-opt] src/test/mir-opt/derefer_terminator_test.rs

bors · 2022-07-12T07:00:17Z

💔 Test failed - checks-actions

TaKO8Ki and others added 14 commits July 6, 2022 20:09

suggest adding a missing zero to a floating point number

6f65b7e

Move EarlyBinder calls in rustc_typeck::outlives a bit further up

f165843

Add bound_const_param_default

9935796

Use map_bound

ad9e1e3

Fix last let_chains blocker

1c3bab2

add new rval, pull deref early

3d07b74

use PlaceRef::iter_projections to fix old FIXME

d84f739

I added this function in 53481a5

placeholders -> inference vars in comment

988e754

implement a suggestion for a floating point number with a type suffix

e03cb7f

Rollup merge of rust-lang#98972 - TaKO8Ki:suggest-adding-missing-zero…

a71f0b0

…-to-floating-point-number, r=compiler-errors Suggest adding a missing zero to a floating point number fixes rust-lang#98836

Rollup merge of rust-lang#99038 - jackh726:earlybinder-cleanup, r=lcnr

8a770e0

Some more `EarlyBinder` cleanups First commit has a couple unrelated cleanups, but otherwise each commit is self-explanatory r? rust-lang/types

Rollup merge of rust-lang#99154 - rosehuds:master, r=cjgillot

b7d42d6

use PlaceRef::iter_projections to fix old FIXME I added this function in 53481a5

rustbot added T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Jul 12, 2022

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jul 12, 2022

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 12, 2022

Dylan-DPC mentioned this pull request Jul 12, 2022

Pull Derefer before ElaborateDrops #98145

Merged

Dylan-DPC closed this Jul 12, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 5 pull requests #99169

Rollup of 5 pull requests #99169

Dylan-DPC commented Jul 12, 2022

Dylan-DPC commented Jul 12, 2022

bors commented Jul 12, 2022

bors commented Jul 12, 2022

rust-log-analyzer commented Jul 12, 2022

bors commented Jul 12, 2022

Rollup of 5 pull requests #99169

Rollup of 5 pull requests #99169

Conversation

Dylan-DPC commented Jul 12, 2022

Dylan-DPC commented Jul 12, 2022

bors commented Jul 12, 2022

bors commented Jul 12, 2022

rust-log-analyzer commented Jul 12, 2022

bors commented Jul 12, 2022