Skip to content

Commit a963d8d

Browse files
Mark-SimulacrumMark-Simulacrum
committed
Rebase tests
1 parent a9903a2 commit a963d8d

33 files changed

+98
-113
lines changed

‎library/core/src/mem/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1036,7 +1036,7 @@ pub const fn discriminant<T>(v: &T) -> Discriminant<T> {
10361036
/// # Examples
10371037
///
10381038
/// ```
1039-
/// # #![feature(never_type)]
1039+
/// # #![cfg_attr(bootstrap, feature(never_type))]
10401040
/// # #![feature(variant_count)]
10411041
///
10421042
/// use std::mem;

‎library/core/src/result.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1410,7 +1410,7 @@ impl<T, E: Into<!>> Result<T, E> {
14101410
/// Basic usage:
14111411
///
14121412
/// ```
1413-
/// # #![feature(never_type)]
1413+
/// # #![cfg_attr(bootstrap, feature(never_type))]
14141414
/// # #![feature(unwrap_infallible)]
14151415
///
14161416
/// fn only_good_news() -> Result<String, !> {
@@ -1446,7 +1446,7 @@ impl<T: Into<!>, E> Result<T, E> {
14461446
/// Basic usage:
14471447
///
14481448
/// ```
1449-
/// # #![feature(never_type)]
1449+
/// # #![cfg_attr(bootstrap, feature(never_type))]
14501450
/// # #![feature(unwrap_infallible)]
14511451
///
14521452
/// fn only_bad_news() -> Result<!, String> {

‎library/core/tests/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
#![feature(const_pin)]
5757
#![feature(const_slice_from_raw_parts)]
5858
#![feature(const_raw_ptr_deref)]
59-
#![feature(never_type)]
59+
#![cfg_attr(bootstrap, feature(never_type))]
6060
#![feature(unwrap_infallible)]
6161
#![feature(option_result_unwrap_unchecked)]
6262
#![feature(result_into_ok_or_err)]

‎library/std/src/primitive_docs.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ mod prim_bool {}
7070
/// write:
7171
///
7272
/// ```
73-
/// #![feature(never_type)]
73+
/// #![cfg_attr(bootstrap, feature(never_type))]
7474
/// # fn foo() -> u32 {
7575
/// let x: ! = {
7676
/// return 123
@@ -229,7 +229,7 @@ mod prim_bool {}
229229
/// for example:
230230
///
231231
/// ```
232-
/// #![feature(never_type)]
232+
/// #![cfg_attr(bootstrap, feature(never_type))]
233233
/// # use std::fmt;
234234
/// # trait Debug {
235235
/// # fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result;

‎src/librustdoc/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#![feature(nll)]
1111
#![feature(test)]
1212
#![feature(crate_visibility_modifier)]
13-
#![feature(never_type)]
13+
#![cfg_attr(bootstrap, feature(never_type))]
1414
#![feature(once_cell)]
1515
#![feature(type_ascription)]
1616
#![feature(iter_intersperse)]

‎src/test/codegen/enum-debug-niche-2.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
// CHECK: {{.*}}DIDerivedType{{.*}}tag: DW_TAG_member,{{.*}}name: "Placeholder",{{.*}}extraData: i64 4294967295{{[,)].*}}
1111
// CHECK: {{.*}}DIDerivedType{{.*}}tag: DW_TAG_member,{{.*}}name: "Error",{{.*}}extraData: i64 0{{[,)].*}}
1212

13-
#![feature(never_type)]
14-
1513
#[derive(Copy, Clone)]
1614
pub struct Entity {
1715
private: std::num::NonZeroU32,

‎src/test/mir-opt/generator_tiny.main-{closure#0}.generator_resume.0.mir

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@
1010
storage_conflicts: BitMatrix(0x0) {},
1111
} */
1212

13-
fn main::{closure#0}(_1: Pin<&mut [generator@$DIR/generator-tiny.rs:19:16: 25:6]>, _2: u8) -> GeneratorState<(), ()> {
13+
fn main::{closure#0}(_1: Pin<&mut [generator@$DIR/generator-tiny.rs:19:16: 25:6]>, _2: u8) -> GeneratorState<(), !> {
1414
debug _x => _10; // in scope 0 at $DIR/generator-tiny.rs:19:17: 19:19
15-
let mut _0: std::ops::GeneratorState<(), ()>; // return place in scope 0 at $DIR/generator-tiny.rs:19:16: 25:6
15+
let mut _0: std::ops::GeneratorState<(), !>; // return place in scope 0 at $DIR/generator-tiny.rs:19:16: 25:6
1616
let _3: HasDrop; // in scope 0 at $DIR/generator-tiny.rs:20:13: 20:15
1717
let mut _4: !; // in scope 0 at $DIR/generator-tiny.rs:21:9: 24:10
1818
let mut _5: (); // in scope 0 at $DIR/generator-tiny.rs:19:16: 25:6
1919
let _6: u8; // in scope 0 at $DIR/generator-tiny.rs:22:13: 22:18
2020
let mut _7: (); // in scope 0 at $DIR/generator-tiny.rs:22:13: 22:18
2121
let _8: (); // in scope 0 at $DIR/generator-tiny.rs:23:13: 23:21
22-
let mut _9: (); // in scope 0 at $DIR/generator-tiny.rs:19:25: 19:25
22+
let mut _9: !; // in scope 0 at $DIR/generator-tiny.rs:19:25: 19:25
2323
let _10: u8; // in scope 0 at $DIR/generator-tiny.rs:19:17: 19:19
2424
let mut _11: u32; // in scope 0 at $DIR/generator-tiny.rs:19:16: 25:6
2525
scope 1 {

‎src/test/mir-opt/issue_62289.test.ElaborateDrops.before.mir

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ fn test() -> Option<Box<u32>> {
44
let mut _0: std::option::Option<std::boxed::Box<u32>>; // return place in scope 0 at $DIR/issue-62289.rs:8:14: 8:30
55
let mut _1: std::boxed::Box<u32>; // in scope 0 at $DIR/issue-62289.rs:9:10: 9:21
66
let mut _2: std::boxed::Box<u32>; // in scope 0 at $DIR/issue-62289.rs:9:10: 9:21
7-
let mut _3: std::ops::ControlFlow<std::option::Option<std::convert::Infallible>, u32>; // in scope 0 at $DIR/issue-62289.rs:9:15: 9:20
7+
let mut _3: std::ops::ControlFlow<std::option::Option<!>, u32>; // in scope 0 at $DIR/issue-62289.rs:9:15: 9:20
88
let mut _4: std::option::Option<u32>; // in scope 0 at $DIR/issue-62289.rs:9:15: 9:19
99
let mut _5: isize; // in scope 0 at $DIR/issue-62289.rs:9:19: 9:20
10-
let _6: std::option::Option<std::convert::Infallible>; // in scope 0 at $DIR/issue-62289.rs:9:19: 9:20
10+
let _6: std::option::Option<!>; // in scope 0 at $DIR/issue-62289.rs:9:19: 9:20
1111
let mut _7: !; // in scope 0 at $DIR/issue-62289.rs:9:19: 9:20
12-
let mut _8: std::option::Option<std::convert::Infallible>; // in scope 0 at $DIR/issue-62289.rs:9:19: 9:20
12+
let mut _8: std::option::Option<!>; // in scope 0 at $DIR/issue-62289.rs:9:19: 9:20
1313
let _9: u32; // in scope 0 at $DIR/issue-62289.rs:9:15: 9:20
1414
scope 1 {
1515
debug residual => _6; // in scope 1 at $DIR/issue-62289.rs:9:19: 9:20
@@ -56,13 +56,13 @@ fn test() -> Option<Box<u32>> {
5656

5757
bb4: {
5858
StorageLive(_6); // scope 0 at $DIR/issue-62289.rs:9:19: 9:20
59-
_6 = ((_3 as Break).0: std::option::Option<std::convert::Infallible>); // scope 0 at $DIR/issue-62289.rs:9:19: 9:20
59+
_6 = ((_3 as Break).0: std::option::Option<!>); // scope 0 at $DIR/issue-62289.rs:9:19: 9:20
6060
StorageLive(_8); // scope 2 at $DIR/issue-62289.rs:9:19: 9:20
6161
_8 = _6; // scope 2 at $DIR/issue-62289.rs:9:19: 9:20
62-
_0 = <Option<Box<u32>> as FromResidual<Option<Infallible>>>::from_residual(move _8) -> [return: bb5, unwind: bb11]; // scope 2 at $DIR/issue-62289.rs:9:15: 9:20
62+
_0 = <Option<Box<u32>> as FromResidual<Option<!>>>::from_residual(move _8) -> [return: bb5, unwind: bb11]; // scope 2 at $DIR/issue-62289.rs:9:15: 9:20
6363
// mir::Constant
6464
// + span: $DIR/issue-62289.rs:9:19: 9:20
65-
// + literal: Const { ty: fn(std::option::Option<std::convert::Infallible>) -> std::option::Option<std::boxed::Box<u32>> {<std::option::Option<std::boxed::Box<u32>> as std::ops::FromResidual<std::option::Option<std::convert::Infallible>>>::from_residual}, val: Value(Scalar(<ZST>)) }
65+
// + literal: Const { ty: fn(std::option::Option<!>) -> std::option::Option<std::boxed::Box<u32>> {<std::option::Option<std::boxed::Box<u32>> as std::ops::FromResidual<std::option::Option<!>>>::from_residual}, val: Value(Scalar(<ZST>)) }
6666
}
6767

6868
bb5: {

‎src/test/mir-opt/lower_intrinsics.unreachable.LowerIntrinsics.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
fn unreachable() -> ! {
55
let mut _0: !; // return place in scope 0 at $DIR/lower_intrinsics.rs:23:25: 23:26
66
let mut _1: !; // in scope 0 at $DIR/lower_intrinsics.rs:23:27: 25:2
7-
let _2: (); // in scope 0 at $DIR/lower_intrinsics.rs:24:14: 24:45
7+
let _2: !; // in scope 0 at $DIR/lower_intrinsics.rs:24:14: 24:45
88
let mut _3: !; // in scope 0 at $DIR/lower_intrinsics.rs:24:14: 24:45
99
scope 1 {
1010
}

‎src/test/mir-opt/separate_const_switch.identity.SeparateConstSwitch.diff

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
- // MIR for `identity` before SeparateConstSwitch
22
+ // MIR for `identity` after SeparateConstSwitch
3-
3+
44
fn identity(_1: Result<i32, i32>) -> Result<i32, i32> {
55
debug x => _1; // in scope 0 at $DIR/separate_const_switch.rs:28:13: 28:14
66
let mut _0: std::result::Result<i32, i32>; // return place in scope 0 at $DIR/separate_const_switch.rs:28:37: 28:53
77
let mut _2: i32; // in scope 0 at $DIR/separate_const_switch.rs:29:8: 29:10
8-
let mut _3: std::ops::ControlFlow<std::result::Result<std::convert::Infallible, i32>, i32>; // in scope 0 at $DIR/separate_const_switch.rs:29:8: 29:10
8+
let mut _3: std::ops::ControlFlow<std::result::Result<!, i32>, i32>; // in scope 0 at $DIR/separate_const_switch.rs:29:8: 29:10
99
let mut _4: std::result::Result<i32, i32>; // in scope 0 at $DIR/separate_const_switch.rs:29:8: 29:9
1010
let mut _5: isize; // in scope 0 at $DIR/separate_const_switch.rs:29:9: 29:10
11-
let _6: std::result::Result<std::convert::Infallible, i32>; // in scope 0 at $DIR/separate_const_switch.rs:29:9: 29:10
11+
let _6: std::result::Result<!, i32>; // in scope 0 at $DIR/separate_const_switch.rs:29:9: 29:10
1212
let mut _7: !; // in scope 0 at $DIR/separate_const_switch.rs:29:9: 29:10
13-
let mut _8: std::result::Result<std::convert::Infallible, i32>; // in scope 0 at $DIR/separate_const_switch.rs:29:9: 29:10
13+
let mut _8: std::result::Result<!, i32>; // in scope 0 at $DIR/separate_const_switch.rs:29:9: 29:10
1414
let _9: i32; // in scope 0 at $DIR/separate_const_switch.rs:29:8: 29:10
1515
scope 1 {
1616
debug residual => _6; // in scope 1 at $DIR/separate_const_switch.rs:29:9: 29:10
@@ -40,7 +40,7 @@
4040
let _11: i32; // in scope 5 at $DIR/separate_const_switch.rs:29:8: 29:10
4141
let mut _12: i32; // in scope 5 at $DIR/separate_const_switch.rs:29:8: 29:10
4242
let _13: i32; // in scope 5 at $DIR/separate_const_switch.rs:29:8: 29:10
43-
let mut _14: std::result::Result<std::convert::Infallible, i32>; // in scope 5 at $DIR/separate_const_switch.rs:29:8: 29:10
43+
let mut _14: std::result::Result<!, i32>; // in scope 5 at $DIR/separate_const_switch.rs:29:8: 29:10
4444
let mut _15: i32; // in scope 5 at $DIR/separate_const_switch.rs:29:8: 29:10
4545
scope 6 {
4646
debug v => _11; // in scope 6 at $DIR/separate_const_switch.rs:29:8: 29:10
@@ -49,7 +49,7 @@
4949
debug e => _13; // in scope 7 at $DIR/separate_const_switch.rs:29:8: 29:10
5050
}
5151
}
52-
52+
5353
bb0: {
5454
StorageLive(_2); // scope 0 at $DIR/separate_const_switch.rs:29:8: 29:10
5555
StorageLive(_3); // scope 0 at $DIR/separate_const_switch.rs:29:8: 29:10
@@ -60,14 +60,14 @@
6060
- switchInt(move _10) -> [0_isize: bb6, 1_isize: bb4, otherwise: bb5]; // scope 5 at $DIR/separate_const_switch.rs:29:8: 29:10
6161
+ switchInt(move _10) -> [0_isize: bb5, 1_isize: bb3, otherwise: bb4]; // scope 5 at $DIR/separate_const_switch.rs:29:8: 29:10
6262
}
63-
63+
6464
bb1: {
6565
- StorageDead(_10); // scope 0 at $DIR/separate_const_switch.rs:29:8: 29:10
6666
- StorageDead(_4); // scope 0 at $DIR/separate_const_switch.rs:29:9: 29:10
6767
- _5 = discriminant(_3); // scope 0 at $DIR/separate_const_switch.rs:29:8: 29:10
6868
- switchInt(move _5) -> [0_isize: bb2, otherwise: bb3]; // scope 0 at $DIR/separate_const_switch.rs:29:8: 29:10
6969
- }
70-
-
70+
-
7171
- bb2: {
7272
StorageLive(_9); // scope 0 at $DIR/separate_const_switch.rs:29:8: 29:10
7373
_9 = ((_3 as Continue).0: i32); // scope 0 at $DIR/separate_const_switch.rs:29:8: 29:10
@@ -79,11 +79,11 @@
7979
StorageDead(_3); // scope 0 at $DIR/separate_const_switch.rs:30:1: 30:2
8080
return; // scope 0 at $DIR/separate_const_switch.rs:30:2: 30:2
8181
}
82-
82+
8383
- bb3: {
8484
+ bb2: {
8585
StorageLive(_6); // scope 0 at $DIR/separate_const_switch.rs:29:9: 29:10
86-
_6 = ((_3 as Break).0: std::result::Result<std::convert::Infallible, i32>); // scope 0 at $DIR/separate_const_switch.rs:29:9: 29:10
86+
_6 = ((_3 as Break).0: std::result::Result<!, i32>); // scope 0 at $DIR/separate_const_switch.rs:29:9: 29:10
8787
StorageLive(_8); // scope 2 at $DIR/separate_const_switch.rs:29:9: 29:10
8888
_8 = _6; // scope 2 at $DIR/separate_const_switch.rs:29:9: 29:10
8989
StorageLive(_16); // scope 8 at $DIR/separate_const_switch.rs:29:8: 29:10
@@ -103,7 +103,7 @@
103103
StorageDead(_3); // scope 0 at $DIR/separate_const_switch.rs:30:1: 30:2
104104
return; // scope 0 at $DIR/separate_const_switch.rs:30:2: 30:2
105105
}
106-
106+
107107
- bb4: {
108108
+ bb3: {
109109
StorageLive(_13); // scope 5 at $DIR/separate_const_switch.rs:29:8: 29:10
@@ -114,7 +114,7 @@
114114
((_14 as Err).0: i32) = move _15; // scope 7 at $DIR/separate_const_switch.rs:29:8: 29:10
115115
discriminant(_14) = 1; // scope 7 at $DIR/separate_const_switch.rs:29:8: 29:10
116116
StorageDead(_15); // scope 7 at $DIR/separate_const_switch.rs:29:8: 29:10
117-
((_3 as Break).0: std::result::Result<std::convert::Infallible, i32>) = move _14; // scope 7 at $DIR/separate_const_switch.rs:29:8: 29:10
117+
((_3 as Break).0: std::result::Result<!, i32>) = move _14; // scope 7 at $DIR/separate_const_switch.rs:29:8: 29:10
118118
discriminant(_3) = 1; // scope 7 at $DIR/separate_const_switch.rs:29:8: 29:10
119119
StorageDead(_14); // scope 7 at $DIR/separate_const_switch.rs:29:8: 29:10
120120
StorageDead(_13); // scope 5 at $DIR/separate_const_switch.rs:29:8: 29:10
@@ -124,12 +124,12 @@
124124
+ _5 = discriminant(_3); // scope 0 at $DIR/separate_const_switch.rs:29:8: 29:10
125125
+ switchInt(move _5) -> [0_isize: bb1, otherwise: bb2]; // scope 0 at $DIR/separate_const_switch.rs:29:8: 29:10
126126
}
127-
127+
128128
- bb5: {
129129
+ bb4: {
130130
unreachable; // scope 5 at $DIR/separate_const_switch.rs:29:8: 29:10
131131
}
132-
132+
133133
- bb6: {
134134
+ bb5: {
135135
StorageLive(_11); // scope 5 at $DIR/separate_const_switch.rs:29:8: 29:10
@@ -147,4 +147,4 @@
147147
+ switchInt(move _5) -> [0_isize: bb1, otherwise: bb2]; // scope 0 at $DIR/separate_const_switch.rs:29:8: 29:10
148148
}
149149
}
150-
150+

0 commit comments

Comments
 (0)