diff options
| author | Chris Denton <chris@chrisdenton.dev> | 2025-04-21 18:53:19 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-21 18:53:19 +0000 |
| commit | df9e15e69f855b94776d5500e2f986952ed93f0a (patch) | |
| tree | 5dc088d4fd92034517f75d8c78cc2dfe6892cad4 | |
| parent | a37f4236cd5aa8bb8774aac1347efecb26388aa1 (diff) | |
| parent | fd4a093a4e9319fa1dc6603ea4ba5a5703ef5009 (diff) | |
| download | rust-df9e15e69f855b94776d5500e2f986952ed93f0a.tar.gz rust-df9e15e69f855b94776d5500e2f986952ed93f0a.zip | |
Rollup merge of #140076 - aDotInTheVoid:jsondocline, r=GuillaumeGomez
jsondocck: Require command is at start of line In one place we use `///``@``` instead of `//``@`.`` The test-runner allowed it, but it probably shouldn't. Ran into by ``@lolbinarycat`` in https://github.com/rust-lang/rust/pull/132748#issuecomment-2816469322: ``` error: unknown disambiguator `?(` ##[error] --> /checkout/tests/rustdoc-json/fns/return_type_alias.rs:3:25 | 3 | ///@ set foo = "$.index[?(``@.name=='Foo')].id"`` | ^^ | ``` Maybe it's also worth erroring on this like we added in #137103 r? ``@GuillaumeGomez``
| -rw-r--r-- | src/tools/jsondocck/src/main.rs | 1 | ||||
| -rw-r--r-- | tests/rustdoc-json/fns/return_type_alias.rs | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/tools/jsondocck/src/main.rs b/src/tools/jsondocck/src/main.rs index 79e419884c6..65ad38da98b 100644 --- a/src/tools/jsondocck/src/main.rs +++ b/src/tools/jsondocck/src/main.rs @@ -154,6 +154,7 @@ impl CommandKind { static LINE_PATTERN: LazyLock<Regex> = LazyLock::new(|| { RegexBuilder::new( r#" + ^\s* //@\s+ (?P<negated>!?) (?P<cmd>[A-Za-z0-9]+(?:-[A-Za-z0-9]+)*) diff --git a/tests/rustdoc-json/fns/return_type_alias.rs b/tests/rustdoc-json/fns/return_type_alias.rs index 0aa1db47b7f..c39abc75894 100644 --- a/tests/rustdoc-json/fns/return_type_alias.rs +++ b/tests/rustdoc-json/fns/return_type_alias.rs @@ -1,6 +1,6 @@ // Regression test for <https://github.com/rust-lang/rust/issues/104851> -///@ set foo = "$.index[?(@.name=='Foo')].id" +//@ set foo = "$.index[?(@.name=='Foo')].id" pub type Foo = i32; //@ is "$.index[?(@.name=='demo')].inner.function.sig.output.resolved_path.id" $foo |