Coercion cleanup

[jackh726]

Want to crater the change to always use LUB in match arms.

r? ghost

[jackh726]

@bors try

[rust-bors]

⌛ Trying commit 6bae9c3 with merge 0bdee9e…

To cancel the try build, run the command @bors try cancel.

Workflow: https://github.com/rust-lang/rust/actions/runs/20308770501

[rust-log-analyzer]

The job x86_64-gnu-gcc failed! Check out the build log: (web) (plain enhanced) (plain)

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

test [mir-opt] tests/mir-opt/unusual_item_types.rs ... ok

failures:

---- [mir-opt] tests/mir-opt/building/match/never_patterns.rs stdout ----
3 fn opt1(_1: &Result<u32, Void>) -> &u32 {
4     debug res => _1;
5     let mut _0: &u32;
-     let mut _2: isize;
-     let _3: &u32;
-     let mut _4: !;
-     let mut _5: ();
+     let _2: &u32;
+     let mut _3: isize;
+     let _4: &u32;
+     let mut _5: !;
+     let mut _6: ();
10     scope 1 {
-         debug x => _3;
+         debug x => _4;
12     }
13 
14     bb0: {

+         StorageLive(_2);
15         PlaceMention(_1);
16         falseEdge -> [real: bb4, imaginary: bb1];
17     }

18 
19     bb1: {
-         _2 = discriminant((*_1));
-         switchInt(move _2) -> [1: bb3, otherwise: bb2];
+         _3 = discriminant((*_1));
+         switchInt(move _3) -> [1: bb3, otherwise: bb2];
22     }
23 
24     bb2: {

32     }
33 
34     bb4: {
-         StorageLive(_3);
-         _3 = &(((*_1) as Ok).0: u32);
-         _0 = &(*_3);
-         StorageDead(_3);
+         StorageLive(_4);
+         _4 = &(((*_1) as Ok).0: u32);
+         _2 = &(*_4);
+         StorageDead(_4);
+         _0 = &(*_2);
+         StorageDead(_2);
39         return;
40     }
41 }


thread '[mir-opt] tests/mir-opt/building/match/never_patterns.rs' panicked at src/tools/compiletest/src/runtest/mir_opt.rs:84:21:
Actual MIR output differs from expected MIR output /checkout/tests/mir-opt/building/match/never_patterns.opt1.SimplifyCfg-initial.after.mir
stack backtrace:
   5: __rustc::rust_begin_unwind
             at /rustc/3b4dd9bf1410f8da6329baa36ce5e37673cbbd1f/library/std/src/panicking.rs:698:5
   6: core::panicking::panic_fmt
             at /rustc/3b4dd9bf1410f8da6329baa36ce5e37673cbbd1f/library/core/src/panicking.rs:80:14

For more information how to resolve CI failures of this job, visit this link.