diff options
| author | bors <bors@rust-lang.org> | 2022-08-12 16:32:24 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-08-12 16:32:24 +0000 |
| commit | f22819bcce4abaff7d1246a56eec493418f9f4ee (patch) | |
| tree | 2fc9ac8d3bfe8d748c4b0971b05b472efca99120 /src/test/rustdoc | |
| parent | 0068b8bf4b150b506ef0871be4e8652fd4308f84 (diff) | |
| parent | 3bc30bb012889eeeb08d5241dfe64fc47ed33537 (diff) | |
| download | rust-f22819bcce4abaff7d1246a56eec493418f9f4ee.tar.gz rust-f22819bcce4abaff7d1246a56eec493418f9f4ee.zip | |
Auto merge of #100456 - Dylan-DPC:rollup-fn17z9f, r=Dylan-DPC
Rollup of 9 pull requests Successful merges: - #100022 (Optimize thread ID generation) - #100030 (cleanup code w/ pointers in std a little) - #100229 (add -Zextra-const-ub-checks to enable more UB checking in const-eval) - #100247 (Generalize trait object generic param check to aliases.) - #100255 (Adding more verbose documentation for `std::fmt::Write`) - #100366 (errors: don't fail on broken primary translations) - #100396 (Suggest const and static for global variable) - #100409 (rustdoc: don't generate DOM element for operator) - #100443 (Add two let else regression tests) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/test/rustdoc')
| -rw-r--r-- | src/test/rustdoc/macro_rules-matchers.rs | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/test/rustdoc/macro_rules-matchers.rs b/src/test/rustdoc/macro_rules-matchers.rs index efc3b21e6da..131c53ec24b 100644 --- a/src/test/rustdoc/macro_rules-matchers.rs +++ b/src/test/rustdoc/macro_rules-matchers.rs @@ -6,16 +6,13 @@ // @has 'foo/macro.todo.html' // @has - '//span[@class="macro"]' 'macro_rules!' // @has - '//span[@class="ident"]' 'todo' -// Note: the only op is the `+` -// @count - '//pre[@class="rust macro"]//span[@class="op"]' 1 // @has - '{ () => { ... }; ($(' // @has - '//span[@class="macro-nonterminal"]' '$' // @has - '//span[@class="macro-nonterminal"]' 'arg' // @has - ':' // @has - '//span[@class="ident"]' 'tt' -// @has - '),' -// @has - '//span[@class="op"]' '+' +// @has - ')+' // @has - ') => { ... }; }' pub use std::todo; |