diff options
| author | bors <bors@rust-lang.org> | 2025-01-22 22:19:08 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-01-22 22:19:08 +0000 |
| commit | a30f9151fe4a841c4643af4e47ad18a23e1fb044 (patch) | |
| tree | 38f5de48919ef0899e06d133d16eec4e23b58868 /tests/ui/macros | |
| parent | 649b995a9febd658b2570160703dff6fdc038ab2 (diff) | |
| parent | 3962bfaeedfc89260c0fb9d976489064f8becc02 (diff) | |
| download | rust-a30f9151fe4a841c4643af4e47ad18a23e1fb044.tar.gz rust-a30f9151fe4a841c4643af4e47ad18a23e1fb044.zip | |
Auto merge of #135896 - matthiaskrgr:rollup-g6rv7za, r=matthiaskrgr
Rollup of 9 pull requests Successful merges: - #132983 (Edit dangling pointers ) - #135409 (Fix ICE-133117: multiple never-pattern arm doesn't have false_edge_start_block) - #135557 (Point at invalid utf-8 span on user's source code) - #135596 (Properly note when query stack is being cut off) - #135794 (Detect missing fields with default values and suggest `..`) - #135814 (ci: use ghcr buildkit image) - #135826 (Misc. `rustc_resolve` cleanups) - #135837 (Remove test panic from File::open) - #135856 (Library: Finalize dyn compatibility renaming) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'tests/ui/macros')
| -rw-r--r-- | tests/ui/macros/not-utf8.rs | 2 | ||||
| -rw-r--r-- | tests/ui/macros/not-utf8.stderr | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/tests/ui/macros/not-utf8.rs b/tests/ui/macros/not-utf8.rs index 8100d65a9f8..ad8ac39d230 100644 --- a/tests/ui/macros/not-utf8.rs +++ b/tests/ui/macros/not-utf8.rs @@ -3,5 +3,5 @@ //@ reference: input.encoding.invalid fn foo() { - include!("not-utf8.bin") + include!("not-utf8.bin"); } diff --git a/tests/ui/macros/not-utf8.stderr b/tests/ui/macros/not-utf8.stderr index 0d587cab5f3..17ee8197ac8 100644 --- a/tests/ui/macros/not-utf8.stderr +++ b/tests/ui/macros/not-utf8.stderr @@ -1,9 +1,14 @@ -error: couldn't read $DIR/not-utf8.bin: stream did not contain valid UTF-8 +error: couldn't read `$DIR/not-utf8.bin`: stream did not contain valid UTF-8 --> $DIR/not-utf8.rs:6:5 | -LL | include!("not-utf8.bin") +LL | include!("not-utf8.bin"); | ^^^^^^^^^^^^^^^^^^^^^^^^ | +note: byte `193` is not valid utf-8 + --> $DIR/not-utf8.bin:1:1 + | +LL | �|�␂!5�cc␕␂�Ӻi��WWj�ȥ�'�}�␒�J�ȉ��W�␞O�@����␜w�V���LO����␔[ ␃_�'���SQ�~ذ��ų&��- ��lN~��!@␌ _#���kQ��h�␝�:�... + | ^ = note: this error originates in the macro `include` (in Nightly builds, run with -Z macro-backtrace for more info) error: aborting due to 1 previous error |