Skip to content

Commit 5e0a129

Browse files
shuashua
committed
bless ui and mir-opt tests
1 parent efe4bfa commit 5e0a129

File tree

97 files changed

+427
-293
lines changed

Some content is hidden

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

97 files changed

+427
-293
lines changed

‎tests/mir-opt/box_partial_move.maybe_move.ElaborateDrops.diff‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
fn maybe_move(_1: bool, _2: Box<String>) -> Option<String> {
55
debug cond => _1;
66
debug thing => _2;
7-
let mut _0: std::option::Option<std::string::String>;
7+
let mut _0: std::option::Option<std::string::generic::String>;
88
let mut _3: bool;
9-
let mut _4: std::string::String;
9+
let mut _4: std::string::generic::String;
1010
+ let mut _5: bool;
11-
+ let mut _6: &mut std::boxed::Box<std::string::String>;
11+
+ let mut _6: &mut std::boxed::Box<std::string::generic::String>;
1212
+ let mut _7: ();
13-
+ let mut _8: &mut std::boxed::Box<std::string::String>;
13+
+ let mut _8: &mut std::boxed::Box<std::string::generic::String>;
1414
+ let mut _9: ();
15-
+ let mut _10: *const std::string::String;
15+
+ let mut _10: *const std::string::generic::String;
1616

1717
bb0: {
1818
+ _5 = const false;
@@ -87,7 +87,7 @@
8787
+ }
8888
+
8989
+ bb14: {
90-
+ _10 = copy ((_2.0: std::ptr::Unique<std::string::String>).0: std::ptr::NonNull<std::string::String>) as *const std::string::String (Transmute);
90+
+ _10 = copy ((_2.0: std::ptr::Unique<std::string::generic::String>).0: std::ptr::NonNull<std::string::generic::String>) as *const std::string::generic::String (Transmute);
9191
+ goto -> bb11;
9292
}
9393
}

‎tests/mir-opt/building/coroutine.main-{closure#0}.StateTransform.after.mir‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/* coroutine_layout = CoroutineLayout {
33
field_tys: {
44
_s0: CoroutineSavedTy {
5-
ty: std::string::String,
5+
ty: std::string::generic::String<std::alloc::Global>,
66
source_info: SourceInfo {
77
span: $DIR/coroutine.rs:18:6: 18:9 (#0),
88
scope: scope[0],
@@ -23,19 +23,19 @@
2323
} */
2424

2525
fn main::{closure#0}(_1: Pin<&mut {coroutine@$DIR/coroutine.rs:18:5: 18:18}>, _2: String) -> CoroutineState<(&str, String, &Location<'_>), ()> {
26-
debug arg => (((*_18) as variant#4).0: std::string::String);
27-
let mut _0: std::ops::CoroutineState<(&str, std::string::String, &std::panic::Location<'_>), ()>;
28-
let _3: std::string::String;
29-
let mut _4: (&str, std::string::String, &std::panic::Location<'_>);
30-
let mut _5: std::string::String;
31-
let mut _6: &std::string::String;
26+
debug arg => (((*_18) as variant#4).0: std::string::generic::String);
27+
let mut _0: std::ops::CoroutineState<(&str, std::string::generic::String, &std::panic::Location<'_>), ()>;
28+
let _3: std::string::generic::String;
29+
let mut _4: (&str, std::string::generic::String, &std::panic::Location<'_>);
30+
let mut _5: std::string::generic::String;
31+
let mut _6: &std::string::generic::String;
3232
let mut _7: &std::panic::Location<'_>;
33-
let _8: std::string::String;
34-
let mut _9: (&str, std::string::String, &std::panic::Location<'_>);
33+
let _8: std::string::generic::String;
34+
let mut _9: (&str, std::string::generic::String, &std::panic::Location<'_>);
3535
let mut _10: &str;
3636
let _11: &str;
37-
let mut _12: std::string::String;
38-
let mut _13: &std::string::String;
37+
let mut _12: std::string::generic::String;
38+
let mut _13: &std::string::generic::String;
3939
let mut _14: &std::panic::Location<'_>;
4040
let _15: &std::panic::Location<'_>;
4141
let mut _16: ();
@@ -49,12 +49,12 @@ fn main::{closure#0}(_1: Pin<&mut {coroutine@$DIR/coroutine.rs:18:5: 18:18}>, _2
4949
}
5050

5151
bb1: {
52-
(((*_18) as variant#4).0: std::string::String) = move _2;
52+
(((*_18) as variant#4).0: std::string::generic::String) = move _2;
5353
StorageLive(_3);
5454
StorageLive(_4);
5555
StorageLive(_5);
5656
StorageLive(_6);
57-
_6 = &(((*_18) as variant#4).0: std::string::String);
57+
_6 = &(((*_18) as variant#4).0: std::string::generic::String);
5858
_5 = <String as Clone>::clone(move _6) -> [return: bb2, unwind unreachable];
5959
}
6060

@@ -98,7 +98,7 @@ fn main::{closure#0}(_1: Pin<&mut {coroutine@$DIR/coroutine.rs:18:5: 18:18}>, _2
9898
_10 = &(*_11);
9999
StorageLive(_12);
100100
StorageLive(_13);
101-
_13 = &(((*_18) as variant#4).0: std::string::String);
101+
_13 = &(((*_18) as variant#4).0: std::string::generic::String);
102102
_12 = <String as Clone>::clone(move _13) -> [return: bb8, unwind unreachable];
103103
}
104104

@@ -142,7 +142,7 @@ fn main::{closure#0}(_1: Pin<&mut {coroutine@$DIR/coroutine.rs:18:5: 18:18}>, _2
142142
StorageDead(_11);
143143
StorageDead(_8);
144144
_16 = const ();
145-
drop((((*_18) as variant#4).0: std::string::String)) -> [return: bb14, unwind unreachable];
145+
drop((((*_18) as variant#4).0: std::string::generic::String)) -> [return: bb14, unwind unreachable];
146146
}
147147

148148
bb14: {

‎tests/mir-opt/building/coroutine.main-{closure#1}.StateTransform.after.mir‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/* coroutine_layout = CoroutineLayout {
33
field_tys: {
44
_s0: CoroutineSavedTy {
5-
ty: std::string::String,
5+
ty: std::string::generic::String<std::alloc::Global>,
66
source_info: SourceInfo {
77
span: $DIR/coroutine.rs:25:6: 25:9 (#0),
88
scope: scope[0],
@@ -23,19 +23,19 @@
2323
} */
2424

2525
fn main::{closure#1}(_1: Pin<&mut {coroutine@$DIR/coroutine.rs:25:5: 25:18}>, _2: String) -> CoroutineState<(&str, String, &Location<'_>), ()> {
26-
debug arg => (((*_18) as variant#4).0: std::string::String);
27-
let mut _0: std::ops::CoroutineState<(&str, std::string::String, &std::panic::Location<'_>), ()>;
28-
let _3: std::string::String;
29-
let mut _4: (&str, std::string::String, &std::panic::Location<'_>);
30-
let mut _5: std::string::String;
31-
let mut _6: &std::string::String;
26+
debug arg => (((*_18) as variant#4).0: std::string::generic::String);
27+
let mut _0: std::ops::CoroutineState<(&str, std::string::generic::String, &std::panic::Location<'_>), ()>;
28+
let _3: std::string::generic::String;
29+
let mut _4: (&str, std::string::generic::String, &std::panic::Location<'_>);
30+
let mut _5: std::string::generic::String;
31+
let mut _6: &std::string::generic::String;
3232
let mut _7: &std::panic::Location<'_>;
33-
let _8: std::string::String;
34-
let mut _9: (&str, std::string::String, &std::panic::Location<'_>);
33+
let _8: std::string::generic::String;
34+
let mut _9: (&str, std::string::generic::String, &std::panic::Location<'_>);
3535
let mut _10: &str;
3636
let _11: &str;
37-
let mut _12: std::string::String;
38-
let mut _13: &std::string::String;
37+
let mut _12: std::string::generic::String;
38+
let mut _13: &std::string::generic::String;
3939
let mut _14: &std::panic::Location<'_>;
4040
let _15: &std::panic::Location<'_>;
4141
let mut _16: ();
@@ -49,12 +49,12 @@ fn main::{closure#1}(_1: Pin<&mut {coroutine@$DIR/coroutine.rs:25:5: 25:18}>, _2
4949
}
5050

5151
bb1: {
52-
(((*_18) as variant#4).0: std::string::String) = move _2;
52+
(((*_18) as variant#4).0: std::string::generic::String) = move _2;
5353
StorageLive(_3);
5454
StorageLive(_4);
5555
StorageLive(_5);
5656
StorageLive(_6);
57-
_6 = &(((*_18) as variant#4).0: std::string::String);
57+
_6 = &(((*_18) as variant#4).0: std::string::generic::String);
5858
_5 = <String as Clone>::clone(move _6) -> [return: bb2, unwind unreachable];
5959
}
6060

@@ -98,7 +98,7 @@ fn main::{closure#1}(_1: Pin<&mut {coroutine@$DIR/coroutine.rs:25:5: 25:18}>, _2
9898
_10 = &(*_11);
9999
StorageLive(_12);
100100
StorageLive(_13);
101-
_13 = &(((*_18) as variant#4).0: std::string::String);
101+
_13 = &(((*_18) as variant#4).0: std::string::generic::String);
102102
_12 = <String as Clone>::clone(move _13) -> [return: bb8, unwind unreachable];
103103
}
104104

@@ -142,7 +142,7 @@ fn main::{closure#1}(_1: Pin<&mut {coroutine@$DIR/coroutine.rs:25:5: 25:18}>, _2
142142
StorageDead(_11);
143143
StorageDead(_8);
144144
_16 = const ();
145-
drop((((*_18) as variant#4).0: std::string::String)) -> [return: bb14, unwind unreachable];
145+
drop((((*_18) as variant#4).0: std::string::generic::String)) -> [return: bb14, unwind unreachable];
146146
}
147147

148148
bb14: {

‎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::generic::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::generic::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::generic::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,13 +3,13 @@
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::generic::String;
77
let _4: ();
88
let mut _5: ();
99
let mut _6: ();
1010
let mut _7: u32;
1111
scope 1 {
12-
debug _s => (((*_1) as variant#3).0: std::string::String);
12+
debug _s => (((*_1) as variant#3).0: std::string::generic::String);
1313
}
1414

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

2626
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,13 +3,13 @@
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::generic::String;
77
let _4: ();
88
let mut _5: ();
99
let mut _6: ();
1010
let mut _7: u32;
1111
scope 1 {
12-
debug _s => (((*_1) as variant#3).0: std::string::String);
12+
debug _s => (((*_1) as variant#3).0: std::string::generic::String);
1313
}
1414

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

2626
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::generic::String>;
1515
let _11: ();
1616
let mut _12: u16;
17-
let mut _13: TypedId<std::string::String>;
17+
let mut _13: TypedId<std::string::generic::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::generic::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::generic::String>;
1515
let _11: ();
1616
let mut _12: u16;
17-
let mut _13: TypedId<std::string::String>;
17+
let mut _13: TypedId<std::string::generic::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::generic::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::generic::String;
9+
let mut _4: std::string::generic::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::generic::String;
9+
let mut _4: std::string::generic::String;
1010

1111
bb0: {
1212
StorageLive(_3);

0 commit comments

Comments
 (0)