diff options
| author | bors <bors@rust-lang.org> | 2019-05-25 04:10:07 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-05-25 04:10:07 +0000 |
| commit | 315ab95a9c13cbb69ae8538fcd69b9f7b0c30f89 (patch) | |
| tree | 11c1b9e9c76d0de8760e02fdca7690e9b8bfd0de /src/libsyntax_ext | |
| parent | 524580312039e4fa5ccf91e8f7093cd755bc1aad (diff) | |
| parent | 19b5a103461c7bce5d53db64380360a684c1ce7d (diff) | |
| download | rust-315ab95a9c13cbb69ae8538fcd69b9f7b0c30f89.tar.gz rust-315ab95a9c13cbb69ae8538fcd69b9f7b0c30f89.zip | |
Auto merge of #61150 - Centril:rollup-wmm7qga, r=Centril
Rollup of 13 pull requests Successful merges: - #61026 (Tweak macro parse errors when reaching EOF during macro call parse) - #61095 (Update cargo) - #61096 (tidy: don't short-circuit on license error) - #61107 (Fix a couple docs typos) - #61110 (Revert edition-guide toolstate override) - #61111 (Fixed type-alias-bounds lint doc) - #61113 (Deprecate `FnBox`. `Box<dyn FnOnce()>` can be called directly, since 1.35) - #61116 (Remove the incorrect warning from README.md) - #61118 (Dont ICE on an attempt to use GAT without feature gate) - #61121 (improve debug-printing of scalars) - #61125 (Updated my mailmap entry) - #61134 (Annotate each `reverse_bits` with `#[must_use]`) - #61138 (Move async/await tests to their own folder) Failed merges: r? @ghost
Diffstat (limited to 'src/libsyntax_ext')
| -rw-r--r-- | src/libsyntax_ext/asm.rs | 6 | ||||
| -rw-r--r-- | src/libsyntax_ext/deriving/custom.rs | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/libsyntax_ext/asm.rs b/src/libsyntax_ext/asm.rs index b8e89c3ecf8..704665e0a84 100644 --- a/src/libsyntax_ext/asm.rs +++ b/src/libsyntax_ext/asm.rs @@ -138,7 +138,11 @@ fn parse_inline_asm<'a>( if p2.token != token::Eof { let mut extra_tts = p2.parse_all_token_trees()?; extra_tts.extend(tts[first_colon..].iter().cloned()); - p = parse::stream_to_parser(cx.parse_sess, extra_tts.into_iter().collect()); + p = parse::stream_to_parser( + cx.parse_sess, + extra_tts.into_iter().collect(), + Some("inline assembly"), + ); } asm = s; diff --git a/src/libsyntax_ext/deriving/custom.rs b/src/libsyntax_ext/deriving/custom.rs index e73110717e9..975d96951dc 100644 --- a/src/libsyntax_ext/deriving/custom.rs +++ b/src/libsyntax_ext/deriving/custom.rs @@ -89,7 +89,7 @@ impl MultiItemModifier for ProcMacroDerive { let error_count_before = ecx.parse_sess.span_diagnostic.err_count(); let msg = "proc-macro derive produced unparseable tokens"; - let mut parser = parse::stream_to_parser(ecx.parse_sess, stream); + let mut parser = parse::stream_to_parser(ecx.parse_sess, stream, Some("proc-macro derive")); let mut items = vec![]; loop { |