diff options
| author | bors <bors@rust-lang.org> | 2021-06-09 03:15:34 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-06-09 03:15:34 +0000 |
| commit | c8381389ee10e3c0505ccb5bac05382de1b9f99d (patch) | |
| tree | 803eab2ca047060b033973af85d031498d6c6e04 /src/test/ui | |
| parent | ed597e7e19d0fe716d9f81b1e840a5abbfd7c28d (diff) | |
| parent | d8376f486566be409d8e6dab4f6cb7de1982c601 (diff) | |
| download | rust-c8381389ee10e3c0505ccb5bac05382de1b9f99d.tar.gz rust-c8381389ee10e3c0505ccb5bac05382de1b9f99d.zip | |
Auto merge of #86160 - JohnTitor:rollup-8ark9x7, r=JohnTitor
Rollup of 11 pull requests Successful merges: - #85676 (Fix documentation style inconsistencies for IP addresses) - #85715 (Document `From` impls in string.rs) - #85791 (Add `Ipv6Addr::is_unicast`) - #85957 (Display defaults on const params- rustdoc ) - #85982 (Enable rustdoc to document safe wasm intrinsics) - #86121 (Forwarding implementation for Seek trait's stream_position method) - #86124 (Include macro name in 'local ambiguity' error) - #86128 (Refactor: Extract render_summary from render_impl.) - #86142 (Simplify proc_macro code using Bound::cloned().) - #86158 (Update books) - #86159 (Update cargo) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/test/ui')
| -rw-r--r-- | src/test/ui/macros/local-ambiguity-multiple-parsing-options.stderr | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/test/ui/macros/local-ambiguity-multiple-parsing-options.stderr b/src/test/ui/macros/local-ambiguity-multiple-parsing-options.stderr index 0ae56c42221..68b278fd3c8 100644 --- a/src/test/ui/macros/local-ambiguity-multiple-parsing-options.stderr +++ b/src/test/ui/macros/local-ambiguity-multiple-parsing-options.stderr @@ -1,10 +1,10 @@ -error: local ambiguity: multiple parsing options: built-in NTs ident ('i') or ident ('j'). +error: local ambiguity when calling macro `ambiguity`: multiple parsing options: built-in NTs ident ('i') or ident ('j'). --> $DIR/local-ambiguity-multiple-parsing-options.rs:7:12 | LL | ambiguity!(error); | ^^^^^ -error: local ambiguity: multiple parsing options: built-in NTs ident ('i') or ident ('j'). +error: local ambiguity when calling macro `ambiguity`: multiple parsing options: built-in NTs ident ('i') or ident ('j'). --> $DIR/local-ambiguity-multiple-parsing-options.rs:8:12 | LL | ambiguity!(error); |