Skip to content

Commit 3b0695e

Browse files
steffahnsteffahn
committed
Bless more test output changes
1 parent 15c5afd commit 3b0695e

File tree

108 files changed

+223
-223
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+223
-223
lines changed

‎src/test/mir-opt/array_index_is_temporary.main.SimplifyCfg-elaborate-drops.after.64bit.mir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ fn main() -> () {
3939
_5 = foo(move _6) -> bb1; // scope 4 at $DIR/array-index-is-temporary.rs:+4:21: +4:27
4040
// mir::Constant
4141
// + span: $DIR/array-index-is-temporary.rs:16:21: 16:24
42-
// + literal: Const { ty: unsafe fn(*mut usize) -> u32 {foo}, val: Value(<ZST>) }
42+
// + literal: Const { ty: [fn item {foo}: unsafe fn(*mut usize) -> u32], val: Value(<ZST>) }
4343
}
4444

4545
bb1: {

‎src/test/mir-opt/box_expr.main.ElaborateDrops.before.mir

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ fn main() -> () {
2222
_4 = alloc::alloc::exchange_malloc(move _2, move _3) -> bb1; // scope 2 at $DIR/box_expr.rs:+1:13: +1:25
2323
// mir::Constant
2424
// + span: $DIR/box_expr.rs:7:13: 7:25
25-
// + literal: Const { ty: unsafe fn(usize, usize) -> *mut u8 {alloc::alloc::exchange_malloc}, val: Value(<ZST>) }
25+
// + literal: Const { ty: [fn item {alloc::alloc::exchange_malloc}: unsafe fn(usize, usize) -> *mut u8], val: Value(<ZST>) }
2626
}
2727

2828
bb1: {
@@ -31,7 +31,7 @@ fn main() -> () {
3131
(*_5) = S::new() -> [return: bb2, unwind: bb8]; // scope 0 at $DIR/box_expr.rs:+1:17: +1:25
3232
// mir::Constant
3333
// + span: $DIR/box_expr.rs:7:17: 7:23
34-
// + literal: Const { ty: fn() -> S {S::new}, val: Value(<ZST>) }
34+
// + literal: Const { ty: [fn item {S::new}: fn() -> S], val: Value(<ZST>) }
3535
}
3636

3737
bb2: {
@@ -47,7 +47,7 @@ fn main() -> () {
4747
_6 = std::mem::drop::<Box<S>>(move _7) -> [return: bb4, unwind: bb6]; // scope 1 at $DIR/box_expr.rs:+2:5: +2:12
4848
// mir::Constant
4949
// + span: $DIR/box_expr.rs:8:5: 8:9
50-
// + literal: Const { ty: fn(Box<S>) {std::mem::drop::<Box<S>>}, val: Value(<ZST>) }
50+
// + literal: Const { ty: [fn item {std::mem::drop::<Box<S>>}: fn(Box<S>)], val: Value(<ZST>) }
5151
}
5252

5353
bb4: {

‎src/test/mir-opt/combine_clone_of_primitives.{impl#0}-clone.InstCombine.diff

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
_2 = <T as Clone>::clone(move _3) -> bb1; // scope 0 at $DIR/combine_clone_of_primitives.rs:+2:5: +2:9
2525
// mir::Constant
2626
// + span: $DIR/combine_clone_of_primitives.rs:8:5: 8:9
27-
// + literal: Const { ty: for<'r> fn(&'r T) -> T {<T as Clone>::clone}, val: Value(<ZST>) }
27+
// + literal: Const { ty: [fn item {<T as Clone>::clone}: for<'r> fn(&'r T) -> T], val: Value(<ZST>) }
2828
}
2929

3030
bb1: {
@@ -37,7 +37,7 @@
3737
- _5 = <u64 as Clone>::clone(move _6) -> [return: bb2, unwind: bb4]; // scope 0 at $DIR/combine_clone_of_primitives.rs:+3:5: +3:11
3838
- // mir::Constant
3939
- // + span: $DIR/combine_clone_of_primitives.rs:9:5: 9:11
40-
- // + literal: Const { ty: for<'r> fn(&'r u64) -> u64 {<u64 as Clone>::clone}, val: Value(<ZST>) }
40+
- // + literal: Const { ty: [fn item {<u64 as Clone>::clone}: for<'r> fn(&'r u64) -> u64], val: Value(<ZST>) }
4141
+ _6 = _7; // scope 0 at $DIR/combine_clone_of_primitives.rs:+3:5: +3:11
4242
+ _5 = (*_6); // scope 0 at $DIR/combine_clone_of_primitives.rs:+3:5: +3:11
4343
+ goto -> bb2; // scope 0 at $DIR/combine_clone_of_primitives.rs:+3:5: +3:11
@@ -53,7 +53,7 @@
5353
- _8 = <[f32; 3] as Clone>::clone(move _9) -> [return: bb3, unwind: bb4]; // scope 0 at $DIR/combine_clone_of_primitives.rs:+4:5: +4:16
5454
- // mir::Constant
5555
- // + span: $DIR/combine_clone_of_primitives.rs:10:5: 10:16
56-
- // + literal: Const { ty: for<'r> fn(&'r [f32; 3]) -> [f32; 3] {<[f32; 3] as Clone>::clone}, val: Value(<ZST>) }
56+
- // + literal: Const { ty: [fn item {<[f32; 3] as Clone>::clone}: for<'r> fn(&'r [f32; 3]) -> [f32; 3]], val: Value(<ZST>) }
5757
+ _9 = _10; // scope 0 at $DIR/combine_clone_of_primitives.rs:+4:5: +4:16
5858
+ _8 = (*_9); // scope 0 at $DIR/combine_clone_of_primitives.rs:+4:5: +4:16
5959
+ goto -> bb3; // scope 0 at $DIR/combine_clone_of_primitives.rs:+4:5: +4:16

‎src/test/mir-opt/const_promotion_extern_static.BAR.PromoteTemps.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
_0 = core::slice::<impl [&i32]>::as_ptr(move _1) -> [return: bb1, unwind: bb2]; // scope 0 at $DIR/const-promotion-extern-static.rs:+0:31: +0:44
3434
// mir::Constant
3535
// + span: $DIR/const-promotion-extern-static.rs:9:36: 9:42
36-
// + literal: Const { ty: for<'r> fn(&'r [&i32]) -> *const &i32 {core::slice::<impl [&i32]>::as_ptr}, val: Value(<ZST>) }
36+
// + literal: Const { ty: [fn item {core::slice::<impl [&i32]>::as_ptr}: for<'r> fn(&'r [&i32]) -> *const &i32], val: Value(<ZST>) }
3737
}
3838

3939
bb1: {

‎src/test/mir-opt/const_promotion_extern_static.FOO.PromoteTemps.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
_0 = core::slice::<impl [&i32]>::as_ptr(move _1) -> [return: bb1, unwind: bb2]; // scope 0 at $DIR/const-promotion-extern-static.rs:+0:31: +0:55
3636
// mir::Constant
3737
// + span: $DIR/const-promotion-extern-static.rs:13:47: 13:53
38-
// + literal: Const { ty: for<'r> fn(&'r [&i32]) -> *const &i32 {core::slice::<impl [&i32]>::as_ptr}, val: Value(<ZST>) }
38+
// + literal: Const { ty: [fn item {core::slice::<impl [&i32]>::as_ptr}: for<'r> fn(&'r [&i32]) -> *const &i32], val: Value(<ZST>) }
3939
}
4040

4141
bb1: {

‎src/test/mir-opt/const_prop/boxes.main.ConstProp.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
+ _6 = alloc::alloc::exchange_malloc(const 4_usize, const 4_usize) -> bb1; // scope 2 at $DIR/boxes.rs:+1:14: +1:22
3333
// mir::Constant
3434
// + span: $DIR/boxes.rs:12:14: 12:22
35-
// + literal: Const { ty: unsafe fn(usize, usize) -> *mut u8 {alloc::alloc::exchange_malloc}, val: Value(<ZST>) }
35+
// + literal: Const { ty: [fn item {alloc::alloc::exchange_malloc}: unsafe fn(usize, usize) -> *mut u8], val: Value(<ZST>) }
3636
}
3737

3838
bb1: {

‎src/test/mir-opt/const_prop/const_prop_fails_gracefully.main.ConstProp.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
_4 = read(move _5) -> bb1; // scope 1 at $DIR/const_prop_fails_gracefully.rs:+3:5: +3:12
3131
// mir::Constant
3232
// + span: $DIR/const_prop_fails_gracefully.rs:8:5: 8:9
33-
// + literal: Const { ty: fn(usize) {read}, val: Value(<ZST>) }
33+
// + literal: Const { ty: [fn item {read}: fn(usize)], val: Value(<ZST>) }
3434
}
3535

3636
bb1: {

‎src/test/mir-opt/const_prop/control_flow_simplification.hello.ConstProp.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
_2 = begin_panic::<&str>(const "explicit panic"); // scope 0 at $SRC_DIR/std/src/panic.rs:LL:COL
2020
// mir::Constant
2121
// + span: $SRC_DIR/std/src/panic.rs:LL:COL
22-
// + literal: Const { ty: fn(&str) -> ! {begin_panic::<&str>}, val: Value(<ZST>) }
22+
// + literal: Const { ty: [fn item {begin_panic::<&str>}: fn(&str) -> !], val: Value(<ZST>) }
2323
// mir::Constant
2424
// + span: $SRC_DIR/std/src/panic.rs:LL:COL
2525
// + literal: Const { ty: &str, val: Value(Slice(..)) }

‎src/test/mir-opt/const_prop/issue_66971.main.ConstProp.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
_1 = encode(move _2) -> bb1; // scope 0 at $DIR/issue-66971.rs:+1:5: +1:23
2121
// mir::Constant
2222
// + span: $DIR/issue-66971.rs:16:5: 16:11
23-
// + literal: Const { ty: fn(((), u8, u8)) {encode}, val: Value(<ZST>) }
23+
// + literal: Const { ty: [fn item {encode}: fn(((), u8, u8))], val: Value(<ZST>) }
2424
}
2525

2626
bb1: {

‎src/test/mir-opt/const_prop/issue_67019.main.ConstProp.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
_1 = test(move _2) -> bb1; // scope 0 at $DIR/issue-67019.rs:+1:5: +1:20
2222
// mir::Constant
2323
// + span: $DIR/issue-67019.rs:11:5: 11:9
24-
// + literal: Const { ty: fn(((u8, u8),)) {test}, val: Value(<ZST>) }
24+
// + literal: Const { ty: [fn item {test}: fn(((u8, u8),))], val: Value(<ZST>) }
2525
}
2626

2727
bb1: {

0 commit comments

Comments
 (0)