Skip to content

Commit 30f97fe

Browse files
zachs18zachs18
committed
Update mir-opt tests
1 parent e40bb15 commit 30f97fe

21 files changed

+86
-86
lines changed

‎tests/mir-opt/building/match/deref-patterns/string.foo.PreCodegen.after.mir

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ fn foo(_1: Option<String>) -> i32 {
55
let mut _0: i32;
66
let mut _2: bool;
77
let mut _3: isize;
8-
let mut _4: &std::string::String;
8+
let mut _4: &std::string::string::String;
99
let mut _5: &str;
1010
let mut _6: bool;
11-
let _7: std::option::Option<std::string::String>;
11+
let _7: std::option::Option<std::string::string::String>;
1212
scope 1 {
1313
debug s => _7;
1414
}
@@ -21,7 +21,7 @@ fn foo(_1: Option<String>) -> i32 {
2121
}
2222

2323
bb1: {
24-
_4 = &((_1 as Some).0: std::string::String);
24+
_4 = &((_1 as Some).0: std::string::string::String);
2525
_5 = <String as Deref>::deref(move _4) -> [return: bb2, unwind unreachable];
2626
}
2727

‎tests/mir-opt/coroutine_drop_cleanup.main-{closure#0}.coroutine_drop.0.panic-abort.mir

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
fn main::{closure#0}(_1: *mut {coroutine@$DIR/coroutine_drop_cleanup.rs:12:5: 12:7}) -> () {
44
let mut _0: ();
55
let mut _2: ();
6-
let _3: std::string::String;
6+
let _3: std::string::string::String;
77
let _4: ();
88
let mut _5: ();
99
let mut _6: ();
1010
let mut _7: ();
1111
let mut _8: u32;
1212
scope 1 {
13-
debug _s => (((*_1) as variant#3).0: std::string::String);
13+
debug _s => (((*_1) as variant#3).0: std::string::string::String);
1414
}
1515

1616
bb0: {
@@ -21,7 +21,7 @@ fn main::{closure#0}(_1: *mut {coroutine@$DIR/coroutine_drop_cleanup.rs:12:5: 12
2121
bb1: {
2222
StorageDead(_5);
2323
StorageDead(_4);
24-
drop((((*_1) as variant#3).0: std::string::String)) -> [return: bb2, unwind unreachable];
24+
drop((((*_1) as variant#3).0: std::string::string::String)) -> [return: bb2, unwind unreachable];
2525
}
2626

2727
bb2: {

‎tests/mir-opt/coroutine_drop_cleanup.main-{closure#0}.coroutine_drop.0.panic-unwind.mir

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
fn main::{closure#0}(_1: *mut {coroutine@$DIR/coroutine_drop_cleanup.rs:12:5: 12:7}) -> () {
44
let mut _0: ();
55
let mut _2: ();
6-
let _3: std::string::String;
6+
let _3: std::string::string::String;
77
let _4: ();
88
let mut _5: ();
99
let mut _6: ();
1010
let mut _7: ();
1111
let mut _8: u32;
1212
scope 1 {
13-
debug _s => (((*_1) as variant#3).0: std::string::String);
13+
debug _s => (((*_1) as variant#3).0: std::string::string::String);
1414
}
1515

1616
bb0: {
@@ -21,7 +21,7 @@ fn main::{closure#0}(_1: *mut {coroutine@$DIR/coroutine_drop_cleanup.rs:12:5: 12
2121
bb1: {
2222
StorageDead(_5);
2323
StorageDead(_4);
24-
drop((((*_1) as variant#3).0: std::string::String)) -> [return: bb2, unwind: bb5];
24+
drop((((*_1) as variant#3).0: std::string::string::String)) -> [return: bb2, unwind: bb5];
2525
}
2626

2727
bb2: {

‎tests/mir-opt/gvn.aggregate_struct_then_transmute.GVN.panic-abort.diff

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
let mut _6: u16;
1212
let mut _7: MyId;
1313
let mut _9: u16;
14-
let mut _10: std::marker::PhantomData<std::string::String>;
14+
let mut _10: std::marker::PhantomData<std::string::string::String>;
1515
let _11: ();
1616
let mut _12: u16;
17-
let mut _13: TypedId<std::string::String>;
17+
let mut _13: TypedId<std::string::string::String>;
1818
let mut _15: u16;
1919
let _16: ();
2020
let mut _17: u16;
@@ -52,7 +52,7 @@
5252
let mut _56: *const i32;
5353
scope 1 {
5454
debug a => _3;
55-
let _8: TypedId<std::string::String>;
55+
let _8: TypedId<std::string::string::String>;
5656
scope 2 {
5757
debug b => _8;
5858
let _14: std::result::Result<Never, u16>;

‎tests/mir-opt/gvn.aggregate_struct_then_transmute.GVN.panic-unwind.diff

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
let mut _6: u16;
1212
let mut _7: MyId;
1313
let mut _9: u16;
14-
let mut _10: std::marker::PhantomData<std::string::String>;
14+
let mut _10: std::marker::PhantomData<std::string::string::String>;
1515
let _11: ();
1616
let mut _12: u16;
17-
let mut _13: TypedId<std::string::String>;
17+
let mut _13: TypedId<std::string::string::String>;
1818
let mut _15: u16;
1919
let _16: ();
2020
let mut _17: u16;
@@ -52,7 +52,7 @@
5252
let mut _56: *const i32;
5353
scope 1 {
5454
debug a => _3;
55-
let _8: TypedId<std::string::String>;
55+
let _8: TypedId<std::string::string::String>;
5656
scope 2 {
5757
debug b => _8;
5858
let _14: std::result::Result<Never, u16>;

‎tests/mir-opt/lower_intrinsics.write_via_move_string.LowerIntrinsics.panic-abort.diff

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
debug r => _1;
66
debug v => _2;
77
let mut _0: ();
8-
let mut _3: *mut std::string::String;
9-
let mut _4: std::string::String;
8+
let mut _3: *mut std::string::string::String;
9+
let mut _4: std::string::string::String;
1010

1111
bb0: {
1212
StorageLive(_3);

‎tests/mir-opt/lower_intrinsics.write_via_move_string.LowerIntrinsics.panic-unwind.diff

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
debug r => _1;
66
debug v => _2;
77
let mut _0: ();
8-
let mut _3: *mut std::string::String;
9-
let mut _4: std::string::String;
8+
let mut _3: *mut std::string::string::String;
9+
let mut _4: std::string::string::String;
1010

1111
bb0: {
1212
StorageLive(_3);

‎tests/mir-opt/match_arm_scopes.complicated_match.panic-abort.SimplifyCfg-initial.after-ElaborateDrops.after.diff

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@
99
let mut _4: &bool;
1010
let _5: bool;
1111
let _6: &bool;
12-
let _7: std::string::String;
13-
let _8: &std::string::String;
12+
let _7: std::string::string::String;
13+
let _8: &std::string::string::String;
1414
let mut _9: bool;
1515
let mut _10: bool;
1616
let mut _11: !;
1717
let mut _12: bool;
1818
let mut _13: bool;
1919
let mut _14: !;
2020
let _15: bool;
21-
let _16: std::string::String;
21+
let _16: std::string::string::String;
2222
scope 1 {
2323
debug a => _5;
2424
debug a => _6;
@@ -62,7 +62,7 @@
6262
StorageLive(_15);
6363
_15 = copy (_2.1: bool);
6464
StorageLive(_16);
65-
_16 = move (_2.2: std::string::String);
65+
_16 = move (_2.2: std::string::string::String);
6666
- goto -> bb20;
6767
+ goto -> bb17;
6868
}
@@ -72,7 +72,7 @@
7272
StorageLive(_15);
7373
_15 = copy (_2.1: bool);
7474
StorageLive(_16);
75-
_16 = move (_2.2: std::string::String);
75+
_16 = move (_2.2: std::string::string::String);
7676
- goto -> bb20;
7777
+ goto -> bb17;
7878
}
@@ -82,7 +82,7 @@
8282
StorageLive(_6);
8383
_6 = &(_2.0: bool);
8484
StorageLive(_8);
85-
_8 = &(_2.2: std::string::String);
85+
_8 = &(_2.2: std::string::string::String);
8686
- _3 = &fake shallow (_2.0: bool);
8787
- _4 = &fake shallow (_2.1: bool);
8888
StorageLive(_12);
@@ -97,7 +97,7 @@
9797
StorageLive(_6);
9898
_6 = &(_2.1: bool);
9999
StorageLive(_8);
100-
_8 = &(_2.2: std::string::String);
100+
_8 = &(_2.2: std::string::string::String);
101101
- _3 = &fake shallow (_2.0: bool);
102102
- _4 = &fake shallow (_2.1: bool);
103103
StorageLive(_9);
@@ -141,7 +141,7 @@
141141
StorageLive(_5);
142142
_5 = copy (_2.1: bool);
143143
StorageLive(_7);
144-
_7 = move (_2.2: std::string::String);
144+
_7 = move (_2.2: std::string::string::String);
145145
- goto -> bb10;
146146
+ goto -> bb7;
147147
}
@@ -183,7 +183,7 @@
183183
StorageLive(_5);
184184
_5 = copy (_2.0: bool);
185185
StorageLive(_7);
186-
_7 = move (_2.2: std::string::String);
186+
_7 = move (_2.2: std::string::string::String);
187187
- goto -> bb10;
188188
+ goto -> bb7;
189189
}

‎tests/mir-opt/match_arm_scopes.complicated_match.panic-unwind.SimplifyCfg-initial.after-ElaborateDrops.after.diff

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@
99
let mut _4: &bool;
1010
let _5: bool;
1111
let _6: &bool;
12-
let _7: std::string::String;
13-
let _8: &std::string::String;
12+
let _7: std::string::string::String;
13+
let _8: &std::string::string::String;
1414
let mut _9: bool;
1515
let mut _10: bool;
1616
let mut _11: !;
1717
let mut _12: bool;
1818
let mut _13: bool;
1919
let mut _14: !;
2020
let _15: bool;
21-
let _16: std::string::String;
21+
let _16: std::string::string::String;
2222
scope 1 {
2323
debug a => _5;
2424
debug a => _6;
@@ -62,7 +62,7 @@
6262
StorageLive(_15);
6363
_15 = copy (_2.1: bool);
6464
StorageLive(_16);
65-
_16 = move (_2.2: std::string::String);
65+
_16 = move (_2.2: std::string::string::String);
6666
- goto -> bb20;
6767
+ goto -> bb17;
6868
}
@@ -72,7 +72,7 @@
7272
StorageLive(_15);
7373
_15 = copy (_2.1: bool);
7474
StorageLive(_16);
75-
_16 = move (_2.2: std::string::String);
75+
_16 = move (_2.2: std::string::string::String);
7676
- goto -> bb20;
7777
+ goto -> bb17;
7878
}
@@ -82,7 +82,7 @@
8282
StorageLive(_6);
8383
_6 = &(_2.0: bool);
8484
StorageLive(_8);
85-
_8 = &(_2.2: std::string::String);
85+
_8 = &(_2.2: std::string::string::String);
8686
- _3 = &fake shallow (_2.0: bool);
8787
- _4 = &fake shallow (_2.1: bool);
8888
StorageLive(_12);
@@ -97,7 +97,7 @@
9797
StorageLive(_6);
9898
_6 = &(_2.1: bool);
9999
StorageLive(_8);
100-
_8 = &(_2.2: std::string::String);
100+
_8 = &(_2.2: std::string::string::String);
101101
- _3 = &fake shallow (_2.0: bool);
102102
- _4 = &fake shallow (_2.1: bool);
103103
StorageLive(_9);
@@ -141,7 +141,7 @@
141141
StorageLive(_5);
142142
_5 = copy (_2.1: bool);
143143
StorageLive(_7);
144-
_7 = move (_2.2: std::string::String);
144+
_7 = move (_2.2: std::string::string::String);
145145
- goto -> bb10;
146146
+ goto -> bb7;
147147
}
@@ -183,7 +183,7 @@
183183
StorageLive(_5);
184184
_5 = copy (_2.0: bool);
185185
StorageLive(_7);
186-
_7 = move (_2.2: std::string::String);
186+
_7 = move (_2.2: std::string::string::String);
187187
- goto -> bb10;
188188
+ goto -> bb7;
189189
}

‎tests/mir-opt/no_spurious_drop_after_call.main.ElaborateDrops.before.panic-abort.mir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
fn main() -> () {
44
let mut _0: ();
55
let _1: ();
6-
let mut _2: std::string::String;
6+
let mut _2: std::string::string::String;
77
let mut _3: &str;
88
let _4: &str;
99

‎tests/mir-opt/no_spurious_drop_after_call.main.ElaborateDrops.before.panic-unwind.mir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
fn main() -> () {
44
let mut _0: ();
55
let _1: ();
6-
let mut _2: std::string::String;
6+
let mut _2: std::string::string::String;
77
let mut _3: &str;
88
let _4: &str;
99

‎tests/mir-opt/slice_drop_shim.core.ptr-drop_in_place.[String;42].AddMovesForPackedDrops.before.mir

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
fn std::ptr::drop_in_place(_1: *mut [String; 42]) -> () {
44
let mut _0: ();
5-
let mut _2: *mut [std::string::String; 42];
6-
let mut _3: *mut [std::string::String];
5+
let mut _2: *mut [std::string::string::String; 42];
6+
let mut _3: *mut [std::string::string::String];
77
let mut _4: usize;
88
let mut _5: usize;
9-
let mut _6: *mut std::string::String;
9+
let mut _6: *mut std::string::string::String;
1010
let mut _7: bool;
11-
let mut _8: *mut std::string::String;
11+
let mut _8: *mut std::string::string::String;
1212
let mut _9: bool;
1313

1414
bb0: {
@@ -57,7 +57,7 @@ fn std::ptr::drop_in_place(_1: *mut [String; 42]) -> () {
5757

5858
bb9: {
5959
_2 = &raw mut (*_1);
60-
_3 = move _2 as *mut [std::string::String] (PointerCoercion(Unsize, Implicit));
60+
_3 = move _2 as *mut [std::string::string::String] (PointerCoercion(Unsize, Implicit));
6161
goto -> bb8;
6262
}
6363
}

‎tests/mir-opt/slice_drop_shim.core.ptr-drop_in_place.[String].AddMovesForPackedDrops.before.mir

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ fn std::ptr::drop_in_place(_1: *mut [String]) -> () {
44
let mut _0: ();
55
let mut _2: usize;
66
let mut _3: usize;
7-
let mut _4: *mut std::string::String;
7+
let mut _4: *mut std::string::string::String;
88
let mut _5: bool;
9-
let mut _6: *mut std::string::String;
9+
let mut _6: *mut std::string::string::String;
1010
let mut _7: bool;
1111

1212
bb0: {

‎tests/mir-opt/tail_call_drops.f.ElaborateDrops.panic-abort.diff

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@
44
fn f() -> () {
55
let mut _0: ();
66
let mut _1: !;
7-
let _2: std::string::String;
7+
let _2: std::string::string::String;
88
let _6: ();
9-
let mut _7: std::string::String;
9+
let mut _7: std::string::string::String;
1010
+ let mut _8: bool;
1111
scope 1 {
1212
debug _a => _2;
1313
let _3: i32;
1414
scope 2 {
1515
debug _b => _3;
16-
let _4: std::string::String;
16+
let _4: std::string::string::String;
1717
scope 3 {
1818
debug _c => _4;
19-
let _5: std::string::String;
19+
let _5: std::string::string::String;
2020
scope 4 {
2121
debug _d => _5;
2222
}

‎tests/mir-opt/tail_call_drops.f.ElaborateDrops.panic-unwind.diff

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@
44
fn f() -> () {
55
let mut _0: ();
66
let mut _1: !;
7-
let _2: std::string::String;
7+
let _2: std::string::string::String;
88
let _6: ();
9-
let mut _7: std::string::String;
9+
let mut _7: std::string::string::String;
1010
+ let mut _8: bool;
1111
scope 1 {
1212
debug _a => _2;
1313
let _3: i32;
1414
scope 2 {
1515
debug _b => _3;
16-
let _4: std::string::String;
16+
let _4: std::string::string::String;
1717
scope 3 {
1818
debug _c => _4;
19-
let _5: std::string::String;
19+
let _5: std::string::string::String;
2020
scope 4 {
2121
debug _d => _5;
2222
}

0 commit comments

Comments
 (0)