diff options
| author | bors <bors@rust-lang.org> | 2024-01-06 15:50:44 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-01-06 15:50:44 +0000 |
| commit | b6a8c762eed0ae0383658c38d65cb91bbd9800a1 (patch) | |
| tree | f8b0eccaad8e13a182a0d397b0ed5e37b8119d4d /tests/rustdoc-js-std/parser-errors.js | |
| parent | 9212108a9b32cc381995cf509dd2627123c11a25 (diff) | |
| parent | 5f0f02810684e1d08c5d1a38acff79f5300086f0 (diff) | |
| download | rust-b6a8c762eed0ae0383658c38d65cb91bbd9800a1.tar.gz rust-b6a8c762eed0ae0383658c38d65cb91bbd9800a1.zip | |
Auto merge of #119662 - matthiaskrgr:rollup-ehofh5n, r=matthiaskrgr
Rollup of 9 pull requests
Successful merges:
- #118194 (rustdoc: search for tuples and unit by type with `()`)
- #118781 (merge core_panic feature into panic_internals)
- #119486 (pass allow-{dirty,staged} to clippy)
- #119591 (rustc_mir_transform: Make DestinationPropagation stable for queries)
- #119595 (Fixed ambiguity in hint.rs)
- #119624 (rustc_span: More consistent span combination operations)
- #119653 (compiler: update Fuchsia sanitizer support.)
- #119655 (Remove ignore-stage1 that was added when changing error count msg)
- #119661 (Strip lld-wrapper binaries)
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'tests/rustdoc-js-std/parser-errors.js')
| -rw-r--r-- | tests/rustdoc-js-std/parser-errors.js | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/tests/rustdoc-js-std/parser-errors.js b/tests/rustdoc-js-std/parser-errors.js index f9f9c4f4de8..16d171260da 100644 --- a/tests/rustdoc-js-std/parser-errors.js +++ b/tests/rustdoc-js-std/parser-errors.js @@ -24,7 +24,7 @@ const PARSED = [ original: "-> *", returned: [], userQuery: "-> *", - error: "Unexpected `*`", + error: "Unexpected `*` after ` `", }, { query: 'a<"P">', @@ -108,22 +108,13 @@ const PARSED = [ error: "Unexpected `::`: paths cannot start with `::`", }, { - query: "((a))", - elems: [], - foundElems: 0, - original: "((a))", - returned: [], - userQuery: "((a))", - error: "Unexpected `(`", - }, - { query: "(p -> p", elems: [], foundElems: 0, original: "(p -> p", returned: [], userQuery: "(p -> p", - error: "Unexpected `(`", + error: "Unexpected `-` after `(`", }, { query: "::a::b", @@ -204,7 +195,7 @@ const PARSED = [ original: "a (b:", returned: [], userQuery: "a (b:", - error: "Unexpected `(`", + error: "Expected `,`, `:` or `->`, found `(`", }, { query: "_:", @@ -249,7 +240,7 @@ const PARSED = [ original: "ab'", returned: [], userQuery: "ab'", - error: "Unexpected `'`", + error: "Unexpected `'` after `b`", }, { query: "a->", |