Fix compile on latest nightly

This commit is contained in:
Alex Crichton 2018-08-16 23:30:40 -07:00
parent 37068cb47f
commit a4e8fb6686

View File

@ -1,5 +1,5 @@
use proc_macro2::*; use proc_macro2::*;
use quote::ToTokens; use quote::{ToTokens, TokenStreamExt};
#[macro_export] #[macro_export]
macro_rules! err_span { macro_rules! err_span {
@ -79,13 +79,13 @@ impl ToTokens for Diagnostic {
Repr::Single { text, span } => { Repr::Single { text, span } => {
let cs2 = (Span::call_site(), Span::call_site()); let cs2 = (Span::call_site(), Span::call_site());
let (start, end) = span.unwrap_or(cs2); let (start, end) = span.unwrap_or(cs2);
dst.extend(Some(Ident::new("compile_error", start).into())); dst.append(Ident::new("compile_error", start));
dst.extend(Some(Punct::new('!', Spacing::Alone).into())); dst.append(Punct::new('!', Spacing::Alone));
let mut message = TokenStream::new(); let mut message = TokenStream::new();
message.extend(Some(Literal::string(text).into())); message.append(Literal::string(text));
let mut group = Group::new(Delimiter::Brace, message); let mut group = Group::new(Delimiter::Brace, message);
group.set_span(end); group.set_span(end);
dst.extend(Some(group.into())); dst.append(group);
} }
Repr::Multi { diagnostics } => { Repr::Multi { diagnostics } => {
for diagnostic in diagnostics { for diagnostic in diagnostics {