about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthias Krüger <matthias.krueger@famsik.de>2025-02-02 23:06:55 +0100
committerGitHub <noreply@github.com>2025-02-02 23:06:55 +0100
commit5ab356fde8f9e607f009f2e30774ae90582b3bb3 (patch)
tree1eeb46fe163f13e093d4115965c0864399edf60e
parent4d3a4ee9e8b0c24b2c865fba162402d8c3c6a3ef (diff)
parent43b729db2f248e3cd6daa113813c5bd2ef43e84f (diff)
downloadrust-5ab356fde8f9e607f009f2e30774ae90582b3bb3.tar.gz
rust-5ab356fde8f9e607f009f2e30774ae90582b3bb3.zip
Rollup merge of #136403 - fmease:fix-a-ui-test, r=oli-obk
Fix malformed error annotations in a UI test

The compiletest DSL still features a historical remnant from the time when its directives were merely prefixed with `//` instead of `//`@`` when unknown directive names weren't rejected since they could just as well be part of prose:

As an "optimization", it stops looking for directives once it stumbles upon a line which starts with either `fn` or `mod`. This allowed a malformed error annotation of the form `//`@[…]~^^^`` to go undetected & unexercised (as it's placed below `fn main() {`).

Obviously a character other than ``@`` would've mangled the error annotation, too (but it might've caught the reviewer's eye). I specifically found this file because I ran `rg '^(fn|mod)[\s\S]*?//`@'` tests/ui --multiline -trust` to check how footgun-y that "special feature" of compiletest is.
-rw-r--r--tests/ui/typeck/path-to-method-sugg-unresolved-expr.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/ui/typeck/path-to-method-sugg-unresolved-expr.rs b/tests/ui/typeck/path-to-method-sugg-unresolved-expr.rs
index 7b4f62fea0c..e095850879c 100644
--- a/tests/ui/typeck/path-to-method-sugg-unresolved-expr.rs
+++ b/tests/ui/typeck/path-to-method-sugg-unresolved-expr.rs
@@ -5,6 +5,6 @@ fn main() {
     let page_size = page_size::get();
     //~^ ERROR failed to resolve: use of unresolved module or unlinked crate `page_size`
     //~| NOTE use of unresolved module or unlinked crate `page_size`
-    //@[cargo-invoked]~^^^ HELP if you wanted to use a crate named `page_size`, use `cargo add
-    //@[only-rustc]~^^^^ HELP you might be missing a crate named `page_size`
+    //[cargo-invoked]~^^^ HELP if you wanted to use a crate named `page_size`, use `cargo add
+    //[only-rustc]~^^^^ HELP you might be missing a crate named `page_size`
 }