Skip to content

Commit 9cc5949

Browse files
m-ou-sem-ou-se
committed
Update tests.
1 parent 0a28977 commit 9cc5949

File tree

4 files changed

+31
-31
lines changed

4 files changed

+31
-31
lines changed

‎tests/mir-opt/sroa/lifetimes.foo.ScalarReplacementOfAggregates.diff

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515
let mut _13: &[&str; 3]; // in scope 0 at $DIR/lifetimes.rs:+10:19: +10:28
1616
let _14: &[&str; 3]; // in scope 0 at $DIR/lifetimes.rs:+10:19: +10:28
1717
let _15: [&str; 3]; // in scope 0 at $DIR/lifetimes.rs:+10:19: +10:28
18-
let mut _16: &[core::fmt::ArgumentV1<'_>]; // in scope 0 at $SRC_DIR/std/src/macros.rs:LL:COL
19-
let mut _17: &[core::fmt::ArgumentV1<'_>; 2]; // in scope 0 at $SRC_DIR/std/src/macros.rs:LL:COL
20-
let _18: &[core::fmt::ArgumentV1<'_>; 2]; // in scope 0 at $SRC_DIR/std/src/macros.rs:LL:COL
21-
let _19: [core::fmt::ArgumentV1<'_>; 2]; // in scope 0 at $SRC_DIR/std/src/macros.rs:LL:COL
22-
let mut _20: core::fmt::ArgumentV1<'_>; // in scope 0 at $DIR/lifetimes.rs:+10:20: +10:23
18+
let mut _16: &[core::fmt::rt::Argument<'_>]; // in scope 0 at $SRC_DIR/std/src/macros.rs:LL:COL
19+
let mut _17: &[core::fmt::rt::Argument<'_>; 2]; // in scope 0 at $SRC_DIR/std/src/macros.rs:LL:COL
20+
let _18: &[core::fmt::rt::Argument<'_>; 2]; // in scope 0 at $SRC_DIR/std/src/macros.rs:LL:COL
21+
let _19: [core::fmt::rt::Argument<'_>; 2]; // in scope 0 at $SRC_DIR/std/src/macros.rs:LL:COL
22+
let mut _20: core::fmt::rt::Argument<'_>; // in scope 0 at $DIR/lifetimes.rs:+10:20: +10:23
2323
let mut _21: &std::boxed::Box<dyn std::fmt::Display>; // in scope 0 at $DIR/lifetimes.rs:+10:20: +10:23
2424
let _22: &std::boxed::Box<dyn std::fmt::Display>; // in scope 0 at $DIR/lifetimes.rs:+10:20: +10:23
25-
let mut _23: core::fmt::ArgumentV1<'_>; // in scope 0 at $DIR/lifetimes.rs:+10:24: +10:27
25+
let mut _23: core::fmt::rt::Argument<'_>; // in scope 0 at $DIR/lifetimes.rs:+10:24: +10:27
2626
let mut _24: &u32; // in scope 0 at $DIR/lifetimes.rs:+10:24: +10:27
2727
let _25: &u32; // in scope 0 at $DIR/lifetimes.rs:+10:24: +10:27
2828
let mut _27: bool; // in scope 0 at $DIR/lifetimes.rs:+12:1: +12:2
@@ -113,11 +113,11 @@
113113
StorageLive(_22); // scope 4 at $DIR/lifetimes.rs:+10:20: +10:23
114114
_22 = &_8; // scope 4 at $DIR/lifetimes.rs:+10:20: +10:23
115115
_21 = &(*_22); // scope 4 at $DIR/lifetimes.rs:+10:20: +10:23
116-
_20 = core::fmt::ArgumentV1::<'_>::new_display::<Box<dyn std::fmt::Display>>(move _21) -> [return: bb3, unwind unreachable]; // scope 4 at $DIR/lifetimes.rs:+10:20: +10:23
116+
_20 = core::fmt::rt::Argument::<'_>::new_display::<Box<dyn std::fmt::Display>>(move _21) -> [return: bb3, unwind unreachable]; // scope 4 at $DIR/lifetimes.rs:+10:20: +10:23
117117
// mir::Constant
118118
// + span: $DIR/lifetimes.rs:27:20: 27:23
119119
// + user_ty: UserType(4)
120-
// + literal: Const { ty: for<'b> fn(&'b Box<dyn std::fmt::Display>) -> core::fmt::ArgumentV1<'b> {core::fmt::ArgumentV1::<'_>::new_display::<Box<dyn std::fmt::Display>>}, val: Value(<ZST>) }
120+
// + literal: Const { ty: for<'b> fn(&'b Box<dyn std::fmt::Display>) -> core::fmt::rt::Argument<'b> {core::fmt::rt::Argument::<'_>::new_display::<Box<dyn std::fmt::Display>>}, val: Value(<ZST>) }
121121
}
122122

123123
bb3: {
@@ -127,11 +127,11 @@
127127
StorageLive(_25); // scope 4 at $DIR/lifetimes.rs:+10:24: +10:27
128128
_25 = &_6; // scope 4 at $DIR/lifetimes.rs:+10:24: +10:27
129129
_24 = &(*_25); // scope 4 at $DIR/lifetimes.rs:+10:24: +10:27
130-
_23 = core::fmt::ArgumentV1::<'_>::new_display::<u32>(move _24) -> [return: bb4, unwind unreachable]; // scope 4 at $DIR/lifetimes.rs:+10:24: +10:27
130+
_23 = core::fmt::rt::Argument::<'_>::new_display::<u32>(move _24) -> [return: bb4, unwind unreachable]; // scope 4 at $DIR/lifetimes.rs:+10:24: +10:27
131131
// mir::Constant
132132
// + span: $DIR/lifetimes.rs:27:24: 27:27
133133
// + user_ty: UserType(5)
134-
// + literal: Const { ty: for<'b> fn(&'b u32) -> core::fmt::ArgumentV1<'b> {core::fmt::ArgumentV1::<'_>::new_display::<u32>}, val: Value(<ZST>) }
134+
// + literal: Const { ty: for<'b> fn(&'b u32) -> core::fmt::rt::Argument<'b> {core::fmt::rt::Argument::<'_>::new_display::<u32>}, val: Value(<ZST>) }
135135
}
136136

137137
bb4: {
@@ -141,13 +141,13 @@
141141
StorageDead(_20); // scope 4 at $SRC_DIR/std/src/macros.rs:LL:COL
142142
_18 = &_19; // scope 4 at $SRC_DIR/std/src/macros.rs:LL:COL
143143
_17 = &(*_18); // scope 4 at $SRC_DIR/std/src/macros.rs:LL:COL
144-
_16 = move _17 as &[core::fmt::ArgumentV1<'_>] (Pointer(Unsize)); // scope 4 at $SRC_DIR/std/src/macros.rs:LL:COL
144+
_16 = move _17 as &[core::fmt::rt::Argument<'_>] (Pointer(Unsize)); // scope 4 at $SRC_DIR/std/src/macros.rs:LL:COL
145145
StorageDead(_17); // scope 4 at $SRC_DIR/std/src/macros.rs:LL:COL
146146
_11 = Arguments::<'_>::new_v1(move _12, move _16) -> [return: bb5, unwind unreachable]; // scope 4 at $SRC_DIR/std/src/macros.rs:LL:COL
147147
// mir::Constant
148148
// + span: $SRC_DIR/std/src/macros.rs:LL:COL
149149
// + user_ty: UserType(3)
150-
// + literal: Const { ty: fn(&[&'static str], &[core::fmt::ArgumentV1<'_>]) -> Arguments<'_> {Arguments::<'_>::new_v1}, val: Value(<ZST>) }
150+
// + literal: Const { ty: fn(&[&'static str], &[core::fmt::rt::Argument<'_>]) -> Arguments<'_> {Arguments::<'_>::new_v1}, val: Value(<ZST>) }
151151
}
152152

153153
bb5: {

‎tests/ui/fmt/ifmt-bad-arg.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ LL | println!("{} {:.*} {}", 1, 3.2, 4);
307307
= note: expected reference `&usize`
308308
found reference `&{float}`
309309
note: associated function defined here
310-
--> $SRC_DIR/core/src/fmt/mod.rs:LL:COL
310+
--> $SRC_DIR/core/src/fmt/rt.rs:LL:COL
311311
= note: this error originates in the macro `$crate::format_args_nl` which comes from the expansion of the macro `println` (in Nightly builds, run with -Z macro-backtrace for more info)
312312

313313
error[E0308]: mismatched types
@@ -321,7 +321,7 @@ LL | println!("{} {:07$.*} {}", 1, 3.2, 4);
321321
= note: expected reference `&usize`
322322
found reference `&{float}`
323323
note: associated function defined here
324-
--> $SRC_DIR/core/src/fmt/mod.rs:LL:COL
324+
--> $SRC_DIR/core/src/fmt/rt.rs:LL:COL
325325
= note: this error originates in the macro `$crate::format_args_nl` which comes from the expansion of the macro `println` (in Nightly builds, run with -Z macro-backtrace for more info)
326326

327327
error: aborting due to 38 previous errors

‎tests/ui/fmt/ifmt-unimpl.stderr

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ LL | format!("{:X}", "3");
1717
NonZeroIsize
1818
and 21 others
1919
= note: required for `&str` to implement `UpperHex`
20-
note: required by a bound in `core::fmt::ArgumentV1::<'a>::new_upper_hex`
21-
--> $SRC_DIR/core/src/fmt/mod.rs:LL:COL
22-
= note: this error originates in the macro `$crate::__export::format_args` which comes from the expansion of the macro `arg_new` (in Nightly builds, run with -Z macro-backtrace for more info)
20+
note: required by a bound in `core::fmt::rt::Argument::<'a>::new_upper_hex`
21+
--> $SRC_DIR/core/src/fmt/rt.rs:LL:COL
22+
= note: this error originates in the macro `$crate::__export::format_args` which comes from the expansion of the macro `format` (in Nightly builds, run with -Z macro-backtrace for more info)
2323

2424
error: aborting due to previous error
2525

‎tests/ui/fmt/send-sync.stderr

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
1-
error[E0277]: `core::fmt::Opaque` cannot be shared between threads safely
1+
error[E0277]: `core::fmt::rt::Opaque` cannot be shared between threads safely
22
--> $DIR/send-sync.rs:8:10
33
|
44
LL | send(format_args!("{:?}", c));
5-
| ---- ^^^^^^^^^^^^^^^^^^^^^^^ `core::fmt::Opaque` cannot be shared between threads safely
5+
| ---- ^^^^^^^^^^^^^^^^^^^^^^^ `core::fmt::rt::Opaque` cannot be shared between threads safely
66
| |
77
| required by a bound introduced by this call
88
|
9-
= help: within `[core::fmt::ArgumentV1<'_>]`, the trait `Sync` is not implemented for `core::fmt::Opaque`
10-
= note: required because it appears within the type `&core::fmt::Opaque`
11-
= note: required because it appears within the type `ArgumentV1<'_>`
12-
= note: required because it appears within the type `[ArgumentV1<'_>]`
13-
= note: required for `&[core::fmt::ArgumentV1<'_>]` to implement `Send`
9+
= help: within `[core::fmt::rt::Argument<'_>]`, the trait `Sync` is not implemented for `core::fmt::rt::Opaque`
10+
= note: required because it appears within the type `&core::fmt::rt::Opaque`
11+
= note: required because it appears within the type `Argument<'_>`
12+
= note: required because it appears within the type `[Argument<'_>]`
13+
= note: required for `&[core::fmt::rt::Argument<'_>]` to implement `Send`
1414
= note: required because it appears within the type `Arguments<'_>`
1515
note: required by a bound in `send`
1616
--> $DIR/send-sync.rs:1:12
1717
|
1818
LL | fn send<T: Send>(_: T) {}
1919
| ^^^^ required by this bound in `send`
2020

21-
error[E0277]: `core::fmt::Opaque` cannot be shared between threads safely
21+
error[E0277]: `core::fmt::rt::Opaque` cannot be shared between threads safely
2222
--> $DIR/send-sync.rs:9:10
2323
|
2424
LL | sync(format_args!("{:?}", c));
25-
| ---- ^^^^^^^^^^^^^^^^^^^^^^^ `core::fmt::Opaque` cannot be shared between threads safely
25+
| ---- ^^^^^^^^^^^^^^^^^^^^^^^ `core::fmt::rt::Opaque` cannot be shared between threads safely
2626
| |
2727
| required by a bound introduced by this call
2828
|
29-
= help: within `Arguments<'_>`, the trait `Sync` is not implemented for `core::fmt::Opaque`
30-
= note: required because it appears within the type `&core::fmt::Opaque`
31-
= note: required because it appears within the type `ArgumentV1<'_>`
32-
= note: required because it appears within the type `[ArgumentV1<'_>]`
33-
= note: required because it appears within the type `&[ArgumentV1<'_>]`
29+
= help: within `Arguments<'_>`, the trait `Sync` is not implemented for `core::fmt::rt::Opaque`
30+
= note: required because it appears within the type `&core::fmt::rt::Opaque`
31+
= note: required because it appears within the type `Argument<'_>`
32+
= note: required because it appears within the type `[Argument<'_>]`
33+
= note: required because it appears within the type `&[Argument<'_>]`
3434
= note: required because it appears within the type `Arguments<'_>`
3535
note: required by a bound in `sync`
3636
--> $DIR/send-sync.rs:2:12

0 commit comments

Comments
 (0)