diff options
| author | bors <bors@rust-lang.org> | 2023-11-21 15:08:24 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-11-21 15:08:24 +0000 |
| commit | 0ff861096449f47956521b40e5e4e88caa7fe27c (patch) | |
| tree | 07e12f9e0b9148d06b867ff956badddab02159c9 /tests/rustdoc-js-std/parser-errors.js | |
| parent | e24e5af787f7015914cbf316063ed5821f370b71 (diff) | |
| parent | fa8878bdccb17b3228014fe8dd1494c19a233a6f (diff) | |
| download | rust-0ff861096449f47956521b40e5e4e88caa7fe27c.tar.gz rust-0ff861096449f47956521b40e5e4e88caa7fe27c.zip | |
Auto merge of #118134 - Nilstrieb:rollup-kyo1l6e, r=Nilstrieb
Rollup of 6 pull requests Successful merges: - #116085 (rustdoc-search: add support for traits and associated types) - #117522 (Remove `--check-cfg` checking of command line `--cfg` args) - #118029 (Expand Miri's BorTag GC to a Provenance GC) - #118035 (Fix early param lifetimes in generic_const_exprs) - #118083 (Remove i686-apple-darwin cross-testing) - #118091 (Remove now deprecated target x86_64-sun-solaris.) 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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/rustdoc-js-std/parser-errors.js b/tests/rustdoc-js-std/parser-errors.js index b32bfea5439..ab8d72bf71b 100644 --- a/tests/rustdoc-js-std/parser-errors.js +++ b/tests/rustdoc-js-std/parser-errors.js @@ -303,7 +303,7 @@ const PARSED = [ original: '->a<>b', returned: [], userQuery: '->a<>b', - error: 'Expected `,` after `>`, found `b`', + error: 'Expected `,` or `=` after `>`, found `b`', }, { query: "a<->", |