diff options
| author | bors <bors@rust-lang.org> | 2023-03-03 16:02:37 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-03-03 16:02:37 +0000 |
| commit | 7a809ce8997a1697b166b4bb2594993e87d69f31 (patch) | |
| tree | 5510959c6bc814d01b5f71f70a733a3f48351a8d /tests/rustdoc-js-std/parser-errors.js | |
| parent | 13471d3b2046cce78181dde6cfc146c09f55e29e (diff) | |
| parent | e85df8d0fe169f8c9b25f2dfe775b62e22ccd20f (diff) | |
| download | rust-7a809ce8997a1697b166b4bb2594993e87d69f31.tar.gz | |
Auto merge of #108677 - matthiaskrgr:rollup-i91cxuf, r=matthiaskrgr
Rollup of 8 pull requests
Successful merges:
- #108022 (Support allocations with non-Box<[u8]> bytes)
- #108367 (Re-apply "switch to the macos-12-xl builder")
- #108557 (Point error span at Some constructor argument when trait resolution fails)
- #108573 (Explain compile-time vs run-time difference in env!() error message)
- #108584 (Put backtick content from rustdoc search errors into a `<code>` elements)
- #108624 (Make `ExprKind` the first field in `thir::Expr`)
- #108644 (Allow setting hashmap toml values in `./configure`)
- #108672 (Feed queries on impl side for RPITITs when using lower_impl_trait_in_trait_to_assoc_ty)
Failed merges:
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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/rustdoc-js-std/parser-errors.js b/tests/rustdoc-js-std/parser-errors.js index f82a2472063..6c5a7770283 100644 --- a/tests/rustdoc-js-std/parser-errors.js +++ b/tests/rustdoc-js-std/parser-errors.js @@ -67,7 +67,7 @@ const PARSED = [ returned: [], typeFilter: -1, userQuery: "a<\"p\">", - error: "`\"` cannot be used in generics", + error: "Unexpected `\"` in generics", }, { elems: [], @@ -373,7 +373,7 @@ const PARSED = [ returned: [], typeFilter: -1, userQuery: "a!a", - error: '`!` can only be at the end of an ident', + error: 'Unexpected `!`: it can only be at the end of an ident', }, { elems: [], |