diff options
| author | bors <bors@rust-lang.org> | 2020-09-23 22:34:44 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-09-23 22:34:44 +0000 |
| commit | c35177582ba22dc7eb3d0d08e972424aed8bd374 (patch) | |
| tree | 7c25b8cd1004b2f7ba74d9ad3b3be6fefe5783cd /src/test/ui/macros | |
| parent | 8b4085359ae798dedb05c95ad42520557bd25320 (diff) | |
| parent | c3c03f2f05f3144c2c24ff10fc6d1cca49a5f0be (diff) | |
Auto merge of #77102 - Dylan-DPC:rollup-2jfrg3u, r=Dylan-DPC
Rollup of 9 pull requests Successful merges: - #76898 (Record `tcx.def_span` instead of `item.span` in crate metadata) - #76939 (emit errors during AbstractConst building) - #76965 (Add cfg(target_has_atomic_equal_alignment) and use it for Atomic::from_mut.) - #76993 (Changing the alloc() to accept &self instead of &mut self) - #76994 (fix small typo in docs and comments) - #77017 (Add missing examples on Vec iter types) - #77042 (Improve documentation for ToSocketAddrs) - #77047 (Miri: more informative deallocation error messages) - #77055 (Add #[track_caller] to more panicking Cell functions) Failed merges: r? `@ghost`
Diffstat (limited to 'src/test/ui/macros')
| -rw-r--r-- | src/test/ui/macros/same-sequence-span.stderr | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/test/ui/macros/same-sequence-span.stderr b/src/test/ui/macros/same-sequence-span.stderr index 65b67a94238..63b8b29d6ce 100644 --- a/src/test/ui/macros/same-sequence-span.stderr +++ b/src/test/ui/macros/same-sequence-span.stderr @@ -17,15 +17,11 @@ LL | $(= $z:tt)* error: `$x:expr` may be followed by `$y:tt`, which is not allowed for `expr` fragments --> $DIR/same-sequence-span.rs:19:1 | -LL | proc_macro_sequence::make_foo!(); - | ^-------------------------------- - | | - | _in this macro invocation +LL | proc_macro_sequence::make_foo!(); + | ---------------------------------^^^^^^^^^^^^^ | | -LL | | -LL | | -LL | | fn main() {} -... | + | not allowed after `expr` fragments + | in this macro invocation | = note: allowed there are: `=>`, `,` or `;` = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info) |