diff options
| author | bors <bors@rust-lang.org> | 2023-02-23 06:28:41 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-02-23 06:28:41 +0000 |
| commit | eb909d81464900597b91f3bbf2a6bef10006c9ff (patch) | |
| tree | 0c8555bbcf96bf156ab5d1a265f10fd94a447825 /tests/mir-opt/dataflow-const-prop/enum.simple.DataflowConstProp.diff | |
| parent | 8b1dbf728add722d4db894b9b986ec24e1cdb0a1 (diff) | |
| parent | 60014e48485b686c3d273e2cfa7dd8f1f01a9607 (diff) | |
Auto merge of #108386 - matthiaskrgr:rollup-nojivk9, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #108063 (Ban associated type bounds in bad positions) - #108208 (Correctly handle aggregates in DataflowConstProp) - #108218 (Windows: Quote more batch file arguments) - #108349 (rustdoc: Prevent duplicated imports) - #108350 (Use associated type bounds in some places in the compiler) - #108358 (Add git config command to `.git-blame-ignore-revs`) - #108373 (hir-analysis: make where-clause-on-main diagnostic translatable) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'tests/mir-opt/dataflow-const-prop/enum.simple.DataflowConstProp.diff')
| -rw-r--r-- | tests/mir-opt/dataflow-const-prop/enum.simple.DataflowConstProp.diff | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/mir-opt/dataflow-const-prop/enum.simple.DataflowConstProp.diff b/tests/mir-opt/dataflow-const-prop/enum.simple.DataflowConstProp.diff index 1fb65e65845..22bdc35d694 100644 --- a/tests/mir-opt/dataflow-const-prop/enum.simple.DataflowConstProp.diff +++ b/tests/mir-opt/dataflow-const-prop/enum.simple.DataflowConstProp.diff @@ -45,8 +45,10 @@ bb3: { StorageLive(_4); // scope 1 at $DIR/enum.rs:+2:29: +2:30 - _4 = ((_1 as V1).0: i32); // scope 1 at $DIR/enum.rs:+2:29: +2:30 - _2 = _4; // scope 3 at $DIR/enum.rs:+2:35: +2:36 +- _4 = ((_1 as V1).0: i32); // scope 1 at $DIR/enum.rs:+2:29: +2:30 +- _2 = _4; // scope 3 at $DIR/enum.rs:+2:35: +2:36 ++ _4 = const 0_i32; // scope 1 at $DIR/enum.rs:+2:29: +2:30 ++ _2 = const 0_i32; // scope 3 at $DIR/enum.rs:+2:35: +2:36 StorageDead(_4); // scope 1 at $DIR/enum.rs:+2:35: +2:36 goto -> bb4; // scope 1 at $DIR/enum.rs:+2:35: +2:36 } |