Auto merge of #144 - bluss:syntax-ext, r=cuviper

Fix num_macros for syntax/syntax_ext crate split
This commit is contained in:
Homu 2015-12-22 05:35:51 +09:00
commit 283a2e192d
1 changed files with 5 additions and 4 deletions

View File

@ -11,6 +11,7 @@
#![feature(plugin_registrar, rustc_private)] #![feature(plugin_registrar, rustc_private)]
extern crate syntax; extern crate syntax;
extern crate syntax_ext;
extern crate rustc_plugin; extern crate rustc_plugin;
use syntax::ast::{MetaItem, Expr}; use syntax::ast::{MetaItem, Expr};
@ -18,8 +19,8 @@ use syntax::ast;
use syntax::codemap::Span; use syntax::codemap::Span;
use syntax::ext::base::{ExtCtxt, Annotatable}; use syntax::ext::base::{ExtCtxt, Annotatable};
use syntax::ext::build::AstBuilder; use syntax::ext::build::AstBuilder;
use syntax::ext::deriving::generic::*; use syntax_ext::deriving::generic::*;
use syntax::ext::deriving::generic::ty::*; use syntax_ext::deriving::generic::ty::*;
use syntax::parse::token::InternedString; use syntax::parse::token::InternedString;
use syntax::ptr::P; use syntax::ptr::P;
use syntax::ext::base::MultiDecorator; use syntax::ext::base::MultiDecorator;
@ -35,13 +36,13 @@ macro_rules! pathvec {
macro_rules! path { macro_rules! path {
($($x:tt)*) => ( ($($x:tt)*) => (
::syntax::ext::deriving::generic::ty::Path::new( pathvec!( $($x)* ) ) ::syntax_ext::deriving::generic::ty::Path::new( pathvec!( $($x)* ) )
) )
} }
macro_rules! path_local { macro_rules! path_local {
($x:ident) => ( ($x:ident) => (
::syntax::ext::deriving::generic::ty::Path::new_local(stringify!($x)) ::syntax_ext::deriving::generic::ty::Path::new_local(stringify!($x))
) )
} }