Skip to content

Commit c6b7607

Browse files
committed
Auto merge of #126878 - matthiaskrgr:rollup-oufemqp, r=matthiaskrgr
Rollup of 9 pull requests Successful merges: - #126230 (tidy: skip submodules if not present for non-CI environments) - #126612 (Update outdated README in build-manifest.) - #126616 (less bootstrap warnings) - #126663 (remove `GIT_DIR` handling in pre-push hook) - #126830 (make unsized_fn_params an internal feature) - #126833 (don't ICE when encountering an extern type field during validation) - #126837 (delegation: Do not crash on qpaths without a trait) - #126851 (Rework pattern and expression nonterminal kinds.) - #126862 (Add needs-symlink directive to compiletest) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 2f41a60 + e75dd39 commit c6b7607

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

src/diagnostics.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,9 @@ pub fn report_error<'tcx>(
311311
ResourceExhaustion(_) => "resource exhaustion",
312312
Unsupported(
313313
// We list only the ones that can actually happen.
314-
UnsupportedOpInfo::Unsupported(_) | UnsupportedOpInfo::UnsizedLocal,
314+
UnsupportedOpInfo::Unsupported(_)
315+
| UnsupportedOpInfo::UnsizedLocal
316+
| UnsupportedOpInfo::ExternTypeField,
315317
) => "unsupported operation",
316318
InvalidProgram(
317319
// We list only the ones that can actually happen.

tests/fail/extern-type-field-offset.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
error: unsupported operation: `extern type` does not have a known offset
1+
error: unsupported operation: `extern type` field does not have a known offset
22
--> $DIR/extern-type-field-offset.rs:LL:CC
33
|
44
LL | let _field = &x.a;
5-
| ^^^^ `extern type` does not have a known offset
5+
| ^^^^ `extern type` field does not have a known offset
66
|
77
= help: this is likely not a bug in the program; it indicates that the program performed an operation that Miri does not support
88
= note: BACKTRACE:

0 commit comments

Comments
 (0)