Skip to content

Commit

Permalink
Fix use proc_macro statements for newest nightly/beta
Browse files Browse the repository at this point in the history
See this for more information:
rust-lang/rust#54418
  • Loading branch information
LukasKalbertodt committed Sep 21, 2018
1 parent 4c0c0ca commit e1cfab2
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/diag.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
//! `.err()` on spans.
//!
use proc_macro::{Span, TokenStream};
use crate::proc_macro::{Span, TokenStream};


/// Extension trait that adds a convenience method to `Diagnostic`. This is
Expand Down
2 changes: 1 addition & 1 deletion src/gen.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use proc_macro::Span;
use crate::proc_macro::Span;
use proc_macro2::TokenStream as TokenStream2;
use quote::{ToTokens, TokenStreamExt};
use syn::{
Expand Down
3 changes: 2 additions & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@

#![cfg_attr(feature = "nightly", feature(proc_macro_diagnostic, proc_macro_span))]

extern crate proc_macro;
#[macro_use]
extern crate quote;

use proc_macro::TokenStream;
use crate::proc_macro::TokenStream;
use proc_macro2::TokenStream as TokenStream2;
use quote::ToTokens;

Expand Down
4 changes: 2 additions & 2 deletions src/proxy.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use std::iter::Peekable;

use proc_macro::{token_stream, TokenStream, TokenTree};
use crate::proc_macro::{token_stream, TokenStream, TokenTree};

use crate::diag::SpanExt;

Expand Down Expand Up @@ -141,7 +141,7 @@ fn eat_type(iter: &mut Peekable<token_stream::IntoIter>) -> Result<ProxyType, ()

#[cfg(test)]
mod test {
use proc_macro::TokenStream;
use crate::proc_macro::TokenStream;

use super::parse_types;

Expand Down
2 changes: 1 addition & 1 deletion src/spanned.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use proc_macro::{Span, TokenStream};
use crate::proc_macro::{Span, TokenStream};
use proc_macro2::TokenStream as TokenStream2;
use quote::ToTokens;

Expand Down

0 comments on commit e1cfab2

Please sign in to comment.