diff options
| author | bors <bors@rust-lang.org> | 2019-07-24 15:59:00 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-07-24 15:59:00 +0000 |
| commit | 03f19f7ff128a3b01eeab3f87f04cce22883f006 (patch) | |
| tree | 5a84f2e53c728cc5aa241b4c01ef5bdf2aee08f6 /src/libsyntax/ext | |
| parent | 27a6a304e2baaabca88059753f020377f2476978 (diff) | |
| parent | e27927d2fff6d8147da7e622f84101cb03521cec (diff) | |
| download | rust-03f19f7ff128a3b01eeab3f87f04cce22883f006.tar.gz rust-03f19f7ff128a3b01eeab3f87f04cce22883f006.zip | |
Auto merge of #62935 - Centril:rollup-hzj9att, r=Centril
Rollup of 10 pull requests Successful merges: - #62641 (Regenerate character tables for Unicode 12.1) - #62716 (state also in the intro that UnsafeCell has no effect on &mut) - #62738 (Remove uses of mem::uninitialized from std::sys::cloudabi) - #62772 (Suggest trait bound on type parameter when it is unconstrained) - #62890 (Normalize use of backticks in compiler messages for libsyntax/*) - #62905 (Normalize use of backticks in compiler messages for doc) - #62916 (Add test `self-in-enum-definition`) - #62917 (Always emit trailing slash error) - #62926 (Fix typo in mem::uninitialized doc) - #62927 (use PanicMessage in MIR, kill InterpError::description) Failed merges: r? @ghost
Diffstat (limited to 'src/libsyntax/ext')
| -rw-r--r-- | src/libsyntax/ext/expand.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs index ae72f1fd108..14d573d07d0 100644 --- a/src/libsyntax/ext/expand.rs +++ b/src/libsyntax/ext/expand.rs @@ -602,7 +602,7 @@ impl<'a, 'b> MacroExpander<'a, 'b> { None => return TokenStream::empty(), } self.cx.span_err(span, "custom attribute invocations must be \ - of the form #[foo] or #[foo(..)], the macro name must only be \ + of the form `#[foo]` or `#[foo(..)]`, the macro name must only be \ followed by a delimiter token"); TokenStream::empty() } |