Skip to content

Commit 87be0d7

Browse files
VoultapherVoultapher
committed
Bless straight forward UI test changes
1 parent 24c0ac1 commit 87be0d7

File tree

7 files changed

+66
-70
lines changed

7 files changed

+66
-70
lines changed

‎tests/ui/feature-gates/feature-gate-format_args_nl.stderr

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,21 @@
11
error[E0658]: use of unstable library feature `format_args_nl`: `format_args_nl` is only for internal language use and is subject to change
2-
--> $DIR/feature-gate-format_args_nl.rs:2:5
2+
--> $DIR/feature-gate-format_args_nl.rs:4:5
33
|
44
LL | format_args_nl!("");
55
| ^^^^^^^^^^^^^^
66
|
77
= help: add `#![feature(format_args_nl)]` to the crate attributes to enable
88
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
99

10-
error: aborting due to 1 previous error
10+
error[E0658]: use of unstable library feature `format_args_nl`: `format_args_nl` is only for internal language use and is subject to change
11+
--> $DIR/feature-gate-format_args_nl.rs:1:5
12+
|
13+
LL | use std::format_args_nl;
14+
| ^^^^^^^^^^^^^^^^^^^
15+
|
16+
= help: add `#![feature(format_args_nl)]` to the crate attributes to enable
17+
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
18+
19+
error: aborting due to 2 previous errors
1120

1221
For more information about this error, try `rustc --explain E0658`.

‎tests/ui/impl-trait/where-allowed.stderr

Lines changed: 10 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -387,34 +387,6 @@ LL | impl <T = impl Debug> T {}
387387
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
388388
= note: for more information, see issue #36887 <https://github.com/rust-lang/rust/issues/36887>
389389

390-
error[E0283]: type annotations needed
391-
--> $DIR/where-allowed.rs:46:57
392-
|
393-
LL | fn in_dyn_Fn_return_in_return() -> &'static dyn Fn() -> impl Debug { panic!() }
394-
| ^^^^^^^^^^ cannot infer type
395-
|
396-
= note: cannot satisfy `_: Debug`
397-
398-
error[E0283]: type annotations needed
399-
--> $DIR/where-allowed.rs:64:46
400-
|
401-
LL | fn in_impl_Fn_return_in_return() -> &'static impl Fn() -> impl Debug { panic!() }
402-
| ^^^^^^^^^^^^^^^^^^^^^^^ cannot infer type
403-
|
404-
= note: multiple `impl`s satisfying `_: Fn()` found in the following crates: `alloc`, `core`:
405-
- impl<A, F> Fn<A> for &F
406-
where A: Tuple, F: Fn<A>, F: ?Sized;
407-
- impl<Args, F, A> Fn<Args> for Box<F, A>
408-
where Args: Tuple, F: Fn<Args>, A: Allocator, F: ?Sized;
409-
410-
error[E0118]: no nominal type found for inherent implementation
411-
--> $DIR/where-allowed.rs:239:1
412-
|
413-
LL | impl <T = impl Debug> T {}
414-
| ^^^^^^^^^^^^^^^^^^^^^^^ impl requires a nominal type
415-
|
416-
= note: either implement a trait on it or create a newtype to wrap it instead
417-
418390
error: unconstrained opaque type
419391
--> $DIR/where-allowed.rs:121:16
420392
|
@@ -431,9 +403,17 @@ LL | type InTypeAlias<R> = impl Debug;
431403
|
432404
= note: `InTypeAlias` must be used in combination with a concrete type within the same crate
433405

434-
error: aborting due to 50 previous errors
406+
error[E0118]: no nominal type found for inherent implementation
407+
--> $DIR/where-allowed.rs:239:1
408+
|
409+
LL | impl <T = impl Debug> T {}
410+
| ^^^^^^^^^^^^^^^^^^^^^^^ impl requires a nominal type
411+
|
412+
= note: either implement a trait on it or create a newtype to wrap it instead
413+
414+
error: aborting due to 48 previous errors
435415

436-
Some errors have detailed explanations: E0053, E0118, E0283, E0562, E0658, E0666.
416+
Some errors have detailed explanations: E0053, E0118, E0562, E0658, E0666.
437417
For more information about an error, try `rustc --explain E0053`.
438418
Future incompatibility report: Future breakage diagnostic:
439419
error: defaults for type parameters are only allowed in `struct`, `enum`, `type`, or `trait` definitions

‎tests/ui/imports/glob-shadowing.stderr

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@ LL | let x = env!("PATH");
55
| ^^^ ambiguous name
66
|
77
= note: ambiguous because of a conflict between a name from a glob import and an outer scope during import or macro resolution
8-
= note: `env` could refer to a macro from prelude
9-
note: `env` could also refer to the macro imported here
8+
note: `env` could refer to the macro imported here
109
--> $DIR/glob-shadowing.rs:9:9
1110
|
1211
LL | use m::*;
1312
| ^^^^
1413
= help: consider adding an explicit import of `env` to disambiguate
1514
= help: or use `self::env` to refer to this macro unambiguously
15+
note: `env` could also refer to a macro from prelude
16+
--> $SRC_DIR/std/src/prelude/mod.rs:LL:COL
1617

1718
error[E0659]: `env` is ambiguous
1819
--> $DIR/glob-shadowing.rs:19:21
@@ -21,13 +22,14 @@ LL | let x = env!("PATH");
2122
| ^^^ ambiguous name
2223
|
2324
= note: ambiguous because of a conflict between a name from a glob import and an outer scope during import or macro resolution
24-
= note: `env` could refer to a macro from prelude
25-
note: `env` could also refer to the macro imported here
25+
note: `env` could refer to the macro imported here
2626
--> $DIR/glob-shadowing.rs:17:13
2727
|
2828
LL | use m::*;
2929
| ^^^^
3030
= help: consider adding an explicit import of `env` to disambiguate
31+
note: `env` could also refer to a macro from prelude
32+
--> $SRC_DIR/std/src/prelude/mod.rs:LL:COL
3133

3234
error[E0659]: `fenv` is ambiguous
3335
--> $DIR/glob-shadowing.rs:29:21

‎tests/ui/imports/local-modularized-tricky-fail-1.stderr

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ LL | panic!();
3030
| ^^^^^ ambiguous name
3131
|
3232
= note: ambiguous because of a conflict between a macro-expanded name and a less macro-expanded name from outer scope during import or macro resolution
33-
= note: `panic` could refer to a macro from prelude
34-
note: `panic` could also refer to the macro defined here
33+
note: `panic` could refer to the macro defined here
3534
--> $DIR/local-modularized-tricky-fail-1.rs:12:5
3635
|
3736
LL | / macro_rules! panic {
@@ -42,6 +41,8 @@ LL | | }
4241
LL | define_panic!();
4342
| --------------- in this macro invocation
4443
= help: use `crate::panic` to refer to this macro unambiguously
44+
note: `panic` could also refer to a macro from prelude
45+
--> $SRC_DIR/std/src/prelude/mod.rs:LL:COL
4546
= note: this error originates in the macro `define_panic` (in Nightly builds, run with -Z macro-backtrace for more info)
4647

4748
error[E0659]: `include` is ambiguous
@@ -51,8 +52,7 @@ LL | include!();
5152
| ^^^^^^^ ambiguous name
5253
|
5354
= note: ambiguous because of a conflict between a macro-expanded name and a less macro-expanded name from outer scope during import or macro resolution
54-
= note: `include` could refer to a macro from prelude
55-
note: `include` could also refer to the macro defined here
55+
note: `include` could refer to the macro defined here
5656
--> $DIR/local-modularized-tricky-fail-1.rs:18:5
5757
|
5858
LL | / macro_rules! include {
@@ -63,6 +63,8 @@ LL | | }
6363
LL | define_include!();
6464
| ----------------- in this macro invocation
6565
= help: use `crate::include` to refer to this macro unambiguously
66+
note: `include` could also refer to a macro from prelude
67+
--> $SRC_DIR/std/src/prelude/mod.rs:LL:COL
6668
= note: this error originates in the macro `define_include` (in Nightly builds, run with -Z macro-backtrace for more info)
6769

6870
error: aborting due to 3 previous errors

‎tests/ui/imports/shadow_builtin_macros.stderr

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@ LL | fn f() { panic!(); }
55
| ^^^^^ ambiguous name
66
|
77
= note: ambiguous because of a conflict between a name from a glob import and an outer scope during import or macro resolution
8-
= note: `panic` could refer to a macro from prelude
9-
note: `panic` could also refer to the macro imported here
8+
note: `panic` could refer to the macro imported here
109
--> $DIR/shadow_builtin_macros.rs:14:9
1110
|
1211
LL | use foo::*;
1312
| ^^^^^^
1413
= help: consider adding an explicit import of `panic` to disambiguate
1514
= help: or use `self::panic` to refer to this macro unambiguously
15+
note: `panic` could also refer to a macro from prelude
16+
--> $SRC_DIR/std/src/prelude/mod.rs:LL:COL
1617

1718
error[E0659]: `panic` is ambiguous
1819
--> $DIR/shadow_builtin_macros.rs:33:5
@@ -21,15 +22,16 @@ LL | panic!();
2122
| ^^^^^ ambiguous name
2223
|
2324
= note: ambiguous because of a conflict between a macro-expanded name and a less macro-expanded name from outer scope during import or macro resolution
24-
= note: `panic` could refer to a macro from prelude
25-
note: `panic` could also refer to the macro defined here
25+
note: `panic` could refer to the macro defined here
2626
--> $DIR/shadow_builtin_macros.rs:30:9
2727
|
2828
LL | macro_rules! panic { () => {} }
2929
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
3030
LL | } }
3131
LL | m!();
3232
| ---- in this macro invocation
33+
note: `panic` could also refer to a macro from prelude
34+
--> $SRC_DIR/std/src/prelude/mod.rs:LL:COL
3335
= note: this error originates in the macro `m` (in Nightly builds, run with -Z macro-backtrace for more info)
3436

3537
error[E0659]: `n` is ambiguous
@@ -59,13 +61,14 @@ LL | fn f() { panic!(); }
5961
| ^^^^^ ambiguous name
6062
|
6163
= note: ambiguous because of a conflict between a macro-expanded name and a less macro-expanded name from outer scope during import or macro resolution
62-
= note: `panic` could refer to a macro from prelude
63-
note: `panic` could also refer to the macro imported here
64+
note: `panic` could refer to the macro imported here
6465
--> $DIR/shadow_builtin_macros.rs:19:26
6566
|
6667
LL | ::two_macros::m!(use foo::panic;);
6768
| ^^^^^^^^^^
6869
= help: use `self::panic` to refer to this macro unambiguously
70+
note: `panic` could also refer to a macro from prelude
71+
--> $SRC_DIR/std/src/prelude/mod.rs:LL:COL
6972

7073
error: aborting due to 4 previous errors
7174

‎tests/ui/lint/dead-code/with-core-crate.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: function `foo` is never used
2-
--> $DIR/with-core-crate.rs:7:4
2+
--> $DIR/with-core-crate.rs:6:4
33
|
44
LL | fn foo() {
55
| ^^^

‎tests/ui/stats/input-stats.stderr

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -61,18 +61,18 @@ ast-stats-2 ----------------------------------------------------------------
6161
ast-stats-2 Crate 40 ( 0.5%) 1 40
6262
ast-stats-2 GenericArgs 40 ( 0.5%) 1 40
6363
ast-stats-2 - AngleBracketed 40 ( 0.5%) 1
64-
ast-stats-2 ExprField 48 ( 0.6%) 1 48
64+
ast-stats-2 ExprField 48 ( 0.7%) 1 48
6565
ast-stats-2 WherePredicate 72 ( 1.0%) 1 72
6666
ast-stats-2 - BoundPredicate 72 ( 1.0%) 1
6767
ast-stats-2 ForeignItem 80 ( 1.1%) 1 80
6868
ast-stats-2 - Fn 80 ( 1.1%) 1
6969
ast-stats-2 Local 80 ( 1.1%) 1 80
7070
ast-stats-2 Arm 96 ( 1.3%) 2 48
71+
ast-stats-2 Attribute 96 ( 1.3%) 3 32
72+
ast-stats-2 - DocComment 32 ( 0.4%) 1
73+
ast-stats-2 - Normal 64 ( 0.9%) 2
7174
ast-stats-2 FnDecl 120 ( 1.6%) 5 24
7275
ast-stats-2 InlineAsm 120 ( 1.6%) 1 120
73-
ast-stats-2 Attribute 128 ( 1.7%) 4 32
74-
ast-stats-2 - DocComment 32 ( 0.4%) 1
75-
ast-stats-2 - Normal 96 ( 1.3%) 3
7676
ast-stats-2 Param 160 ( 2.2%) 4 40
7777
ast-stats-2 Stmt 160 ( 2.2%) 5 32
7878
ast-stats-2 - Let 32 ( 0.4%) 1
@@ -81,13 +81,13 @@ ast-stats-2 - Expr 96 ( 1.3%) 3
8181
ast-stats-2 Block 192 ( 2.6%) 6 32
8282
ast-stats-2 FieldDef 208 ( 2.8%) 2 104
8383
ast-stats-2 Variant 208 ( 2.8%) 2 104
84-
ast-stats-2 AssocItem 320 ( 4.3%) 4 80
84+
ast-stats-2 AssocItem 320 ( 4.4%) 4 80
8585
ast-stats-2 - Fn 160 ( 2.2%) 2
8686
ast-stats-2 - Type 160 ( 2.2%) 2
8787
ast-stats-2 GenericBound 352 ( 4.8%) 4 88
8888
ast-stats-2 - Trait 352 ( 4.8%) 4
8989
ast-stats-2 GenericParam 480 ( 6.5%) 5 96
90-
ast-stats-2 Pat 504 ( 6.8%) 7 72
90+
ast-stats-2 Pat 504 ( 6.9%) 7 72
9191
ast-stats-2 - Struct 72 ( 1.0%) 1
9292
ast-stats-2 - Wild 72 ( 1.0%) 1
9393
ast-stats-2 - Ident 360 ( 4.9%) 5
@@ -96,24 +96,24 @@ ast-stats-2 - InlineAsm 72 ( 1.0%) 1
9696
ast-stats-2 - Match 72 ( 1.0%) 1
9797
ast-stats-2 - Path 72 ( 1.0%) 1
9898
ast-stats-2 - Struct 72 ( 1.0%) 1
99-
ast-stats-2 - Lit 144 ( 1.9%) 2
99+
ast-stats-2 - Lit 144 ( 2.0%) 2
100100
ast-stats-2 - Block 216 ( 2.9%) 3
101-
ast-stats-2 PathSegment 864 (11.7%) 36 24
102-
ast-stats-2 Ty 896 (12.1%) 14 64
101+
ast-stats-2 PathSegment 840 (11.4%) 35 24
102+
ast-stats-2 Ty 896 (12.2%) 14 64
103103
ast-stats-2 - Ptr 64 ( 0.9%) 1
104104
ast-stats-2 - Ref 64 ( 0.9%) 1
105105
ast-stats-2 - ImplicitSelf 128 ( 1.7%) 2
106-
ast-stats-2 - Path 640 ( 8.6%) 10
107-
ast-stats-2 Item 1_584 (21.4%) 11 144
108-
ast-stats-2 - Enum 144 ( 1.9%) 1
109-
ast-stats-2 - ExternCrate 144 ( 1.9%) 1
110-
ast-stats-2 - ForeignMod 144 ( 1.9%) 1
111-
ast-stats-2 - Impl 144 ( 1.9%) 1
112-
ast-stats-2 - Trait 144 ( 1.9%) 1
106+
ast-stats-2 - Path 640 ( 8.7%) 10
107+
ast-stats-2 Item 1_584 (21.6%) 11 144
108+
ast-stats-2 - Enum 144 ( 2.0%) 1
109+
ast-stats-2 - ExternCrate 144 ( 2.0%) 1
110+
ast-stats-2 - ForeignMod 144 ( 2.0%) 1
111+
ast-stats-2 - Impl 144 ( 2.0%) 1
112+
ast-stats-2 - Trait 144 ( 2.0%) 1
113113
ast-stats-2 - Fn 288 ( 3.9%) 2
114114
ast-stats-2 - Use 576 ( 7.8%) 4
115115
ast-stats-2 ----------------------------------------------------------------
116-
ast-stats-2 Total 7_400 127
116+
ast-stats-2 Total 7_344 125
117117
ast-stats-2
118118
hir-stats HIR STATS
119119
hir-stats Name Accumulated Size Count Item Size
@@ -134,12 +134,12 @@ hir-stats InlineAsm 72 ( 0.8%) 1 72
134134
hir-stats WherePredicate 72 ( 0.8%) 3 24
135135
hir-stats - BoundPredicate 72 ( 0.8%) 3
136136
hir-stats Arm 80 ( 0.9%) 2 40
137+
hir-stats Attribute 96 ( 1.1%) 3 32
137138
hir-stats Stmt 96 ( 1.1%) 3 32
138139
hir-stats - Expr 32 ( 0.4%) 1
139140
hir-stats - Let 32 ( 0.4%) 1
140141
hir-stats - Semi 32 ( 0.4%) 1
141142
hir-stats FnDecl 120 ( 1.3%) 3 40
142-
hir-stats Attribute 128 ( 1.4%) 4 32
143143
hir-stats FieldDef 128 ( 1.4%) 2 64
144144
hir-stats GenericArgs 144 ( 1.6%) 3 48
145145
hir-stats Variant 144 ( 1.6%) 2 72
@@ -151,11 +151,11 @@ hir-stats - Struct 72 ( 0.8%) 1
151151
hir-stats - Wild 72 ( 0.8%) 1
152152
hir-stats - Binding 216 ( 2.4%) 3
153153
hir-stats GenericParam 400 ( 4.5%) 5 80
154-
hir-stats Generics 560 ( 6.2%) 10 56
154+
hir-stats Generics 560 ( 6.3%) 10 56
155155
hir-stats Ty 720 ( 8.0%) 15 48
156156
hir-stats - Ptr 48 ( 0.5%) 1
157157
hir-stats - Ref 48 ( 0.5%) 1
158-
hir-stats - Path 624 ( 6.9%) 13
158+
hir-stats - Path 624 ( 7.0%) 13
159159
hir-stats Expr 768 ( 8.6%) 12 64
160160
hir-stats - InlineAsm 64 ( 0.7%) 1
161161
hir-stats - Match 64 ( 0.7%) 1
@@ -171,8 +171,8 @@ hir-stats - Impl 88 ( 1.0%) 1
171171
hir-stats - Trait 88 ( 1.0%) 1
172172
hir-stats - Fn 176 ( 2.0%) 2
173173
hir-stats - Use 352 ( 3.9%) 4
174-
hir-stats Path 1_240 (13.8%) 31 40
175-
hir-stats PathSegment 1_920 (21.4%) 40 48
174+
hir-stats Path 1_240 (13.9%) 31 40
175+
hir-stats PathSegment 1_920 (21.5%) 40 48
176176
hir-stats ----------------------------------------------------------------
177-
hir-stats Total 8_980 180
177+
hir-stats Total 8_948 179
178178
hir-stats

0 commit comments

Comments
 (0)