diff options
| author | bors <bors@rust-lang.org> | 2019-02-25 03:48:12 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-02-25 03:48:12 +0000 |
| commit | c1911babed0364ede7dedc646dbca63fac03d5c5 (patch) | |
| tree | a7f6a7d6a44bcafa523052938587718261c4da15 /src/libsyntax_ext | |
| parent | eb1df8c8a7b368c31c3bf58074327c7ae7f54710 (diff) | |
| parent | 6806d0cf692edf9aa308cc841c81afbfc83c03bf (diff) | |
| download | rust-c1911babed0364ede7dedc646dbca63fac03d5c5.tar.gz rust-c1911babed0364ede7dedc646dbca63fac03d5c5.zip | |
Auto merge of #58714 - Centril:rollup, r=Centril
Rollup of 5 pull requests Successful merges: - #58370 (Relax some Hash bounds on HashMap<K, V, S> and HashSet<T, S>) - #58421 (Relax some Ord bounds on BinaryHeap<T>) - #58686 (replace deprecated rustfmt_skip with rustfmt::skip) - #58697 (Use ? in some macros) - #58704 (Remove some unnecessary 'extern crate') Failed merges: r? @ghost
Diffstat (limited to 'src/libsyntax_ext')
| -rw-r--r-- | src/libsyntax_ext/proc_macro_server.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax_ext/proc_macro_server.rs b/src/libsyntax_ext/proc_macro_server.rs index 699539b62f5..4c4b33c0442 100644 --- a/src/libsyntax_ext/proc_macro_server.rs +++ b/src/libsyntax_ext/proc_macro_server.rs @@ -69,7 +69,7 @@ impl FromInternal<(TreeAndJoint, &'_ ParseSess, &'_ mut Vec<Self>)> }; macro_rules! tt { - ($ty:ident { $($field:ident $(: $value:expr)*),+ $(,)* }) => ( + ($ty:ident { $($field:ident $(: $value:expr)*),+ $(,)? }) => ( TokenTree::$ty(self::$ty { $($field $(: $value)*,)* span, |