Skip to content

Commit dd0c12c

Browse files
eholkeholk
committed
Update test output
1 parent edb4c6a commit dd0c12c

File tree

6 files changed

+31
-25
lines changed

6 files changed

+31
-25
lines changed

‎compiler/rustc_codegen_ssa/src/base.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,6 @@ pub fn unsized_info<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>>(
208208
fn vtable_ptr_ty<'tcx, Cx: CodegenMethods<'tcx>>(
209209
cx: &Cx,
210210
target: Ty<'tcx>,
211-
// FIXME(dyn-star): This should be only place we need a `DynKind`, so move its definition here.
212211
kind: ty::DynKind,
213212
) -> <Cx as BackendTypes>::Type {
214213
cx.scalar_pair_element_backend_type(

‎tests/ui-fulldeps/internal-lints/ty_tykind_usage.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ fn main() {
2828
TyKind::FnDef(..) => (), //~ ERROR usage of `ty::TyKind::<kind>`
2929
TyKind::FnPtr(..) => (), //~ ERROR usage of `ty::TyKind::<kind>`
3030
TyKind::Dynamic(..) => (), //~ ERROR usage of `ty::TyKind::<kind>`
31+
TyKind::DynStar(..) => (), //~ ERROR usage of `ty::TyKind::<kind>`
3132
TyKind::Closure(..) => (), //~ ERROR usage of `ty::TyKind::<kind>`
3233
TyKind::Generator(..) => (), //~ ERROR usage of `ty::TyKind::<kind>`
3334
TyKind::GeneratorWitness(..) => (), //~ ERROR usage of `ty::TyKind::<kind>`

‎tests/ui-fulldeps/internal-lints/ty_tykind_usage.stderr‎

Lines changed: 23 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -103,112 +103,118 @@ LL | TyKind::Dynamic(..) => (),
103103
error: usage of `ty::TyKind::<kind>`
104104
--> $DIR/ty_tykind_usage.rs:31:9
105105
|
106-
LL | TyKind::Closure(..) => (),
106+
LL | TyKind::DynStar(..) => (),
107107
| ^^^^^^ help: try using `ty::<kind>` directly: `ty`
108108

109109
error: usage of `ty::TyKind::<kind>`
110110
--> $DIR/ty_tykind_usage.rs:32:9
111111
|
112-
LL | TyKind::Generator(..) => (),
112+
LL | TyKind::Closure(..) => (),
113113
| ^^^^^^ help: try using `ty::<kind>` directly: `ty`
114114

115115
error: usage of `ty::TyKind::<kind>`
116116
--> $DIR/ty_tykind_usage.rs:33:9
117117
|
118-
LL | TyKind::GeneratorWitness(..) => (),
118+
LL | TyKind::Generator(..) => (),
119119
| ^^^^^^ help: try using `ty::<kind>` directly: `ty`
120120

121121
error: usage of `ty::TyKind::<kind>`
122122
--> $DIR/ty_tykind_usage.rs:34:9
123123
|
124-
LL | TyKind::GeneratorWitnessMIR(..) => (),
124+
LL | TyKind::GeneratorWitness(..) => (),
125125
| ^^^^^^ help: try using `ty::<kind>` directly: `ty`
126126

127127
error: usage of `ty::TyKind::<kind>`
128128
--> $DIR/ty_tykind_usage.rs:35:9
129129
|
130-
LL | TyKind::Never => (),
130+
LL | TyKind::GeneratorWitnessMIR(..) => (),
131131
| ^^^^^^ help: try using `ty::<kind>` directly: `ty`
132132

133133
error: usage of `ty::TyKind::<kind>`
134134
--> $DIR/ty_tykind_usage.rs:36:9
135135
|
136-
LL | TyKind::Tuple(..) => (),
136+
LL | TyKind::Never => (),
137137
| ^^^^^^ help: try using `ty::<kind>` directly: `ty`
138138

139139
error: usage of `ty::TyKind::<kind>`
140140
--> $DIR/ty_tykind_usage.rs:37:9
141141
|
142-
LL | TyKind::Alias(..) => (),
142+
LL | TyKind::Tuple(..) => (),
143143
| ^^^^^^ help: try using `ty::<kind>` directly: `ty`
144144

145145
error: usage of `ty::TyKind::<kind>`
146146
--> $DIR/ty_tykind_usage.rs:38:9
147147
|
148-
LL | TyKind::Param(..) => (),
148+
LL | TyKind::Alias(..) => (),
149149
| ^^^^^^ help: try using `ty::<kind>` directly: `ty`
150150

151151
error: usage of `ty::TyKind::<kind>`
152152
--> $DIR/ty_tykind_usage.rs:39:9
153153
|
154-
LL | TyKind::Bound(..) => (),
154+
LL | TyKind::Param(..) => (),
155155
| ^^^^^^ help: try using `ty::<kind>` directly: `ty`
156156

157157
error: usage of `ty::TyKind::<kind>`
158158
--> $DIR/ty_tykind_usage.rs:40:9
159159
|
160-
LL | TyKind::Placeholder(..) => (),
160+
LL | TyKind::Bound(..) => (),
161161
| ^^^^^^ help: try using `ty::<kind>` directly: `ty`
162162

163163
error: usage of `ty::TyKind::<kind>`
164164
--> $DIR/ty_tykind_usage.rs:41:9
165165
|
166-
LL | TyKind::Infer(..) => (),
166+
LL | TyKind::Placeholder(..) => (),
167167
| ^^^^^^ help: try using `ty::<kind>` directly: `ty`
168168

169169
error: usage of `ty::TyKind::<kind>`
170170
--> $DIR/ty_tykind_usage.rs:42:9
171171
|
172+
LL | TyKind::Infer(..) => (),
173+
| ^^^^^^ help: try using `ty::<kind>` directly: `ty`
174+
175+
error: usage of `ty::TyKind::<kind>`
176+
--> $DIR/ty_tykind_usage.rs:43:9
177+
|
172178
LL | TyKind::Error(_) => (),
173179
| ^^^^^^ help: try using `ty::<kind>` directly: `ty`
174180

175181
error: usage of `ty::TyKind::<kind>`
176-
--> $DIR/ty_tykind_usage.rs:47:12
182+
--> $DIR/ty_tykind_usage.rs:48:12
177183
|
178184
LL | if let TyKind::Int(int_ty) = kind {}
179185
| ^^^^^^ help: try using `ty::<kind>` directly: `ty`
180186

181187
error: usage of `ty::TyKind`
182-
--> $DIR/ty_tykind_usage.rs:49:24
188+
--> $DIR/ty_tykind_usage.rs:50:24
183189
|
184190
LL | fn ty_kind(ty_bad: TyKind<'_>, ty_good: Ty<'_>) {}
185191
| ^^^^^^^^^^
186192
|
187193
= help: try using `Ty` instead
188194

189195
error: usage of `ty::TyKind`
190-
--> $DIR/ty_tykind_usage.rs:51:37
196+
--> $DIR/ty_tykind_usage.rs:52:37
191197
|
192198
LL | fn ir_ty_kind<I: Interner>(bad: IrTyKind<I>) -> IrTyKind<I> {
193199
| ^^^^^^^^^^^
194200
|
195201
= help: try using `Ty` instead
196202

197203
error: usage of `ty::TyKind`
198-
--> $DIR/ty_tykind_usage.rs:51:53
204+
--> $DIR/ty_tykind_usage.rs:52:53
199205
|
200206
LL | fn ir_ty_kind<I: Interner>(bad: IrTyKind<I>) -> IrTyKind<I> {
201207
| ^^^^^^^^^^^
202208
|
203209
= help: try using `Ty` instead
204210

205211
error: usage of `ty::TyKind::<kind>`
206-
--> $DIR/ty_tykind_usage.rs:54:9
212+
--> $DIR/ty_tykind_usage.rs:55:9
207213
|
208214
LL | IrTyKind::Bool
209215
| --------^^^^^^
210216
| |
211217
| help: try using `ty::<kind>` directly: `ty`
212218

213-
error: aborting due to 33 previous errors
219+
error: aborting due to 34 previous errors
214220

‎tests/ui/dyn-star/no-implicit-dyn-star.stderr‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ error[E0308]: mismatched types
22
--> $DIR/no-implicit-dyn-star.rs:6:48
33
|
44
LL | dyn_star_foreign::require_dyn_star_display(1usize);
5-
| ------------------------------------------ ^^^^^^ expected `dyn Display`, found `usize`
5+
| ------------------------------------------ ^^^^^^ expected `dyn* Display`, found `usize`
66
| |
77
| arguments to this function are incorrect
88
|
9-
= note: expected trait object `(dyn* std::fmt::Display + 'static)`
10-
found type `usize`
9+
= note: expected dyn* trait object `(dyn* std::fmt::Display + 'static)`
10+
found type `usize`
1111
note: function defined here
1212
--> $DIR/auxiliary/dyn-star-foreign.rs:6:8
1313
|

‎tests/ui/symbol-names/basic.legacy.stderr‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
error: symbol-name(_ZN5basic4main17he9f658e438f1cac0E)
1+
error: symbol-name(_ZN5basic4main17h3e65e1d718c4ae5dE)
22
--> $DIR/basic.rs:8:1
33
|
44
LL | #[rustc_symbol_name]
55
| ^^^^^^^^^^^^^^^^^^^^
66

7-
error: demangling(basic::main::he9f658e438f1cac0)
7+
error: demangling(basic::main::h3e65e1d718c4ae5d)
88
--> $DIR/basic.rs:8:1
99
|
1010
LL | #[rustc_symbol_name]

‎tests/ui/symbol-names/issue-60925.legacy.stderr‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
error: symbol-name(_ZN11issue_609253foo37Foo$LT$issue_60925..llv$u6d$..Foo$GT$3foo17h13209029be24b923E)
1+
error: symbol-name(_ZN11issue_609253foo37Foo$LT$issue_60925..llv$u6d$..Foo$GT$3foo17h1b7e17f9a390a4d8E)
22
--> $DIR/issue-60925.rs:21:9
33
|
44
LL | #[rustc_symbol_name]
55
| ^^^^^^^^^^^^^^^^^^^^
66

7-
error: demangling(issue_60925::foo::Foo<issue_60925::llvm::Foo>::foo::h13209029be24b923)
7+
error: demangling(issue_60925::foo::Foo<issue_60925::llvm::Foo>::foo::h1b7e17f9a390a4d8)
88
--> $DIR/issue-60925.rs:21:9
99
|
1010
LL | #[rustc_symbol_name]

0 commit comments

Comments
 (0)