Skip to content

Commit

Permalink
Update to the next version of proc-macro2
Browse files Browse the repository at this point in the history 
Depends on dtolnay/quote#73
Depends on dtolnay/proc-macro2#90
Depends on a new nightly
  • Loading branch information
@alexcrichton
alexcrichton committed May 16, 2018
1 parent 1df4ef0 commit ac41f76
Show file tree
Hide file tree
Showing 28 changed files with 526 additions and 786 deletions.
10 changes: 7 additions & 3 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ visit-mut = []
fold = []
clone-impls = []
extra-traits = []
proc-macro = ["proc-macro2/proc-macro", "quote/proc-macro"]
proc-macro = ["proc-macro2/proc-macro"]

[dependencies]
proc-macro2 = { version = "0.3", default-features = false }
quote = { version = "0.5", optional = true, default-features = false }
proc-macro2 = { version = "0.4", default-features = false }
quote = { version = "0.6", optional = true, default-features = false }
unicode-xid = "0.1"

[dev-dependencies]
Expand All @@ -42,3 +42,7 @@ all-features = true

[package.metadata.playground]
all-features = true

[patch.crates-io]
proc-macro2 = { git = 'https://github.com/alexcrichton/proc-macro2', branch = 'next' }
quote = { git = 'https://github.com/alexcrichton/quote', branch = 'next' }
8 changes: 6 additions & 2 deletions codegen/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@ publish = false # this is an internal crate which should never be published

[dependencies]
syn = { path = "..", features = ["full", "extra-traits"] }
quote = "0.5"
quote = "0.6"
failure = "0.1"
inflections = "1.1"
proc-macro2 = "0.3"
proc-macro2 = "0.4"

[patch.crates-io]
proc-macro2 = { git = 'https://github.com/alexcrichton/proc-macro2', branch = 'next' }
quote = { git = 'https://github.com/alexcrichton/quote', branch = 'next' }
76 changes: 39 additions & 37 deletions codegen/src/main.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,9 @@ extern crate quote;
extern crate syn;

use quote::{ToTokens, Tokens};
use syn::{Attribute, Data, DataStruct, DeriveInput, Ident, Item};
use syn::{Attribute, Data, DataStruct, DeriveInput, Item};
use failure::{err_msg, Error};
use proc_macro2::{Ident, Span};

use std::io::{Read, Write};
use std::fmt::{self, Debug};
Expand All @@ -43,19 +44,19 @@ const EXTRA_TYPES: &[&str] = &["Ident", "Lifetime"];

const TERMINAL_TYPES: &[&str] = &["Span"];

fn path_eq(a: &syn::Path, b: &syn::Path) -> bool {
if a.global() != b.global() || a.segments.len() != b.segments.len() {
return false;
fn path_eq(a: &syn::Path, b: &str) -> bool {
if a.global() {
return false
}
a.segments
.iter()
.zip(b.segments.iter())
.all(|(a, b)| a.ident == b.ident)
if a.segments.len() != 1 {
return false
}
a.segments[0].ident.to_string() == b
}

fn get_features(attrs: &[Attribute], mut features: Tokens) -> Tokens {
for attr in attrs {
if path_eq(&attr.path, &"cfg".into()) {
if path_eq(&attr.path, "cfg") {
attr.to_tokens(&mut features);
}
}
Expand Down Expand Up @@ -106,7 +107,7 @@ fn load_file<P: AsRef<Path>>(name: P, features: &Tokens, lookup: &mut Lookup) ->
// We don't want to try to load the generated rust files and
// parse them, so we ignore them here.
for name in IGNORED_MODS {
if item.ident == name {
if item.ident.to_string() == *name {
continue 'items;
}
}
Expand All @@ -116,15 +117,15 @@ fn load_file<P: AsRef<Path>>(name: P, features: &Tokens, lookup: &mut Lookup) ->
//
// The derive module is weird because it is built with either
// `full` or `derive` but exported only under `derive`.
let features = if item.ident == "derive" {
let features = if item.ident.to_string() == "derive" {
quote!(#[cfg(feature = "derive")])
} else {
get_features(&item.attrs, features.clone())
};

// Look up the submodule file, and recursively parse it.
// XXX: Only handles same-directory .rs file submodules.
let path = parent.join(&format!("{}.rs", item.ident.as_ref()));
let path = parent.join(&format!("{}.rs", item.ident));
load_file(path, &features, lookup)?;
}
Item::Macro(item) => {
Expand All @@ -134,15 +135,15 @@ fn load_file<P: AsRef<Path>>(name: P, features: &Tokens, lookup: &mut Lookup) ->

// Try to parse the AstItem declaration out of the item.
let tts = &item.mac.tts;
let found = if path_eq(&item.mac.path, &"ast_struct".into()) {
let found = if path_eq(&item.mac.path, "ast_struct") {
syn::parse_str::<parsing::AstStruct>(&quote!(#tts).to_string())
.map_err(|_| err_msg("failed to parse ast_struct"))?
.0
} else if path_eq(&item.mac.path, &"ast_enum".into()) {
} else if path_eq(&item.mac.path, "ast_enum") {
syn::parse_str::<parsing::AstEnum>(&quote!(#tts).to_string())
.map_err(|_| err_msg("failed to parse ast_enum"))?
.0
} else if path_eq(&item.mac.path, &"ast_enum_of_structs".into()) {
} else if path_eq(&item.mac.path, "ast_enum_of_structs") {
syn::parse_str::<parsing::AstEnumOfStructs>(&quote!(#tts).to_string())
.map_err(|_| err_msg("failed to parse ast_enum_of_structs"))?
.0
Expand All @@ -153,13 +154,13 @@ fn load_file<P: AsRef<Path>>(name: P, features: &Tokens, lookup: &mut Lookup) ->
// Record our features on the parsed AstItems.
for mut item in found {
features.to_tokens(&mut item.features);
lookup.insert(item.ast.ident, item);
lookup.insert(item.ast.ident.clone(), item);
}
}
Item::Struct(item) => {
let ident = item.ident;
if EXTRA_TYPES.contains(&ident.as_ref()) {
lookup.insert(ident, AstItem {
if EXTRA_TYPES.contains(&&ident.to_string()[..]) {
lookup.insert(ident.clone(), AstItem {
ast: DeriveInput {
ident: ident,
vis: item.vis,
Expand Down Expand Up @@ -189,14 +190,14 @@ mod parsing {
use syn::synom::*;
use syn::*;
use quote::Tokens;
use proc_macro2::TokenStream;
use proc_macro2::{TokenStream, Ident};

// Parses #full - returns #[cfg(feature = "full")] if it is present, and
// nothing otherwise.
named!(full -> (Tokens, bool), map!(option!(do_parse!(
punct!(#) >>
id: syn!(Ident) >>
cond_reduce!(id == "full") >>
cond_reduce!(id.to_string() == "full") >>
()
)), |s| if s.is_some() {
(quote!(#[cfg(feature = "full")]), true)
Expand All @@ -207,7 +208,7 @@ mod parsing {
named!(manual_extra_traits -> (), do_parse!(
punct!(#) >>
id: syn!(Ident) >>
cond_reduce!(id == "manual_extra_traits") >>
cond_reduce!(id.to_string() == "manual_extra_traits") >>
()
));

Expand Down Expand Up @@ -241,7 +242,7 @@ mod parsing {
named!(no_visit -> (), do_parse!(
punct!(#) >>
id: syn!(Ident) >>
cond_reduce!(id == "no_visit") >>
cond_reduce!(id.to_string() == "no_visit") >>
()
));

Expand Down Expand Up @@ -280,7 +281,7 @@ mod parsing {
keyword!(pub) >>
variant: syn!(Ident) >>
member: option!(map!(parens!(alt!(
call!(ast_struct_inner) => { |x: AstItem| (Path::from(x.ast.ident), Some(x)) }
call!(ast_struct_inner) => { |x: AstItem| (Path::from(x.ast.ident.clone()), Some(x)) }
|
syn!(Path) => { |x| (x, None) }
)), |x| x.1)) >>
Expand All @@ -307,7 +308,7 @@ mod parsing {
// tokens to strings to re-parse them.
let enum_item = {
let variants = variants.1.iter().map(|v| {
let name = v.name;
let name = v.name.clone();
match v.member {
Some(ref member) => quote!(#name(#member)),
None => quote!(#name),
Expand Down Expand Up @@ -335,6 +336,7 @@ mod codegen {
use syn::punctuated::Punctuated;
use quote::{ToTokens, Tokens};
use std::fmt::{self, Display};
use proc_macro2::{Ident, Span};

#[derive(Default)]
pub struct State {
Expand All @@ -348,7 +350,7 @@ mod codegen {

fn under_name(name: Ident) -> Ident {
use inflections::Inflect;
name.as_ref().to_snake_case().into()
Ident::new(&name.to_string().to_snake_case(), Span::call_site())
}

enum RelevantType<'a> {
Expand All @@ -366,13 +368,13 @@ mod codegen {
match *ty {
Type::Path(TypePath { qself: None, ref path }) => {
let last = path.segments.last().unwrap().into_value();
match last.ident.as_ref() {
match &last.ident.to_string()[..] {
"Box" => RelevantType::Box(first_arg(&last.arguments)),
"Vec" => RelevantType::Vec(first_arg(&last.arguments)),
"Punctuated" => RelevantType::Punctuated(first_arg(&last.arguments)),
"Option" => RelevantType::Option(first_arg(&last.arguments)),
"Brace" | "Bracket" | "Paren" | "Group" => {
RelevantType::Token(last.ident.into_tokens())
RelevantType::Token(last.ident.clone().into_tokens())
}
_ => {
if let Some(item) = lookup.get(&last.ident) {
Expand All @@ -386,7 +388,7 @@ mod codegen {
Type::Tuple(TypeTuple { ref elems, .. }) => {
RelevantType::Tuple(elems)
}
Type::Macro(TypeMacro { ref mac }) if mac.path.segments.last().unwrap().into_value().ident == "Token" => {
Type::Macro(TypeMacro { ref mac }) if mac.path.segments.last().unwrap().into_value().ident.to_string() == "Token" => {
RelevantType::Token(mac.into_tokens())
}
_ => RelevantType::Pass,
Expand Down Expand Up @@ -467,17 +469,17 @@ mod codegen {
match kind {
Visit => format!(
"_visitor.visit_{under_name}({name})",
under_name = under_name(item.ast.ident),
under_name = under_name(item.ast.ident.clone()),
name = name.ref_tokens(),
),
VisitMut => format!(
"_visitor.visit_{under_name}_mut({name})",
under_name = under_name(item.ast.ident),
under_name = under_name(item.ast.ident.clone()),
name = name.ref_mut_tokens(),
),
Fold => format!(
"_visitor.fold_{under_name}({name})",
under_name = under_name(item.ast.ident),
under_name = under_name(item.ast.ident.clone()),
name = name.owned_tokens(),
),
}
Expand Down Expand Up @@ -695,7 +697,7 @@ mod codegen {
}

pub fn generate(state: &mut State, lookup: &Lookup, s: &AstItem) {
let under_name = under_name(s.ast.ident);
let under_name = under_name(s.ast.ident.clone());

state.visit_trait.push_str(&format!(
"{features}\n\
Expand Down Expand Up @@ -783,7 +785,7 @@ mod codegen {
state.fold_impl.push_str(", ");

let mut tokens = quote!();
Ident::from(name).to_tokens(&mut tokens);
Ident::new(&name, Span::call_site()).to_tokens(&mut tokens);

(el, tokens)
})
Expand Down Expand Up @@ -872,7 +874,7 @@ mod codegen {
fields.named
.iter()
.map(|el| {
let id = el.ident;
let id = el.ident.clone();
(el, quote!(_i.#id))
})
.collect()
Expand Down Expand Up @@ -962,10 +964,10 @@ fn main() {
for &tt in TERMINAL_TYPES {
use syn::*;
lookup.insert(
Ident::from(tt),
Ident::new(&tt, Span::call_site()),
AstItem {
ast: DeriveInput {
ident: Ident::from(tt),
ident: Ident::new(tt, Span::call_site()),
vis: Visibility::Public(VisPublic {
pub_token: Default::default(),
}),
Expand Down Expand Up @@ -1015,7 +1017,7 @@ macro_rules! full {
use *;
#[cfg(any(feature = \"full\", feature = \"derive\"))]
use token::{{Brace, Bracket, Paren, Group}};
use proc_macro2::Span;
use proc_macro2::{{Span, Ident}};
#[cfg(any(feature = \"full\", feature = \"derive\"))]
use gen::helper::fold::*;
Expand Down
Loading

0 comments on commit ac41f76

Please sign in to comment.