xeos
/
num-traits
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update num-macros to Rust master

This commit is contained in:
Alex Crichton 2015-05-14 10:19:47 -07:00
parent b75dbbdfcb
commit 44679902bd
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitignore vendored
View File

@ -1,4 +1,2 @@
/Cargo.lock Cargo.lock
/num_macros/Cargo.lock target
/num_macros/target
/target

2
num-macros/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "num-macros" name = "num-macros"
version = "0.1.22" version = "0.1.23"
authors = ["The Rust Project Developers"] authors = ["The Rust Project Developers"]
license = "MIT/Apache-2.0" license = "MIT/Apache-2.0"
homepage = "https://github.com/rust-lang/num" homepage = "https://github.com/rust-lang/num"

14
num-macros/src/lib.rs
View File

@ -13,16 +13,16 @@
extern crate syntax; extern crate syntax;
extern crate rustc; extern crate rustc;
use syntax::ast::{MetaItem, Item, Expr}; use syntax::ast::{MetaItem, Expr};
use syntax::ast; use syntax::ast;
use syntax::codemap::Span; use syntax::codemap::Span;
use syntax::ext::base::ExtCtxt; 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::Decorator; use syntax::ext::base::MultiDecorator;
use syntax::parse::token; use syntax::parse::token;
use rustc::plugin::Registry; use rustc::plugin::Registry;
@ -64,8 +64,8 @@ macro_rules! path_std {
pub fn expand_deriving_from_primitive(cx: &mut ExtCtxt, pub fn expand_deriving_from_primitive(cx: &mut ExtCtxt,
span: Span, span: Span,
mitem: &MetaItem, mitem: &MetaItem,
item: &Item, item: Annotatable,
push: &mut FnMut(P<Item>)) push: &mut FnMut(Annotatable))
{ {
let inline = cx.meta_word(span, InternedString::new("inline")); let inline = cx.meta_word(span, InternedString::new("inline"));
let attrs = vec!(cx.attribute(span, inline)); let attrs = vec!(cx.attribute(span, inline));
@ -110,7 +110,7 @@ pub fn expand_deriving_from_primitive(cx: &mut ExtCtxt,
associated_types: Vec::new(), associated_types: Vec::new(),
}; };
trait_def.expand(cx, mitem, item, push) trait_def.expand(cx, mitem, &item, push)
} }
fn cs_from(name: &str, cx: &mut ExtCtxt, trait_span: Span, substr: &Substructure) -> P<Expr> { fn cs_from(name: &str, cx: &mut ExtCtxt, trait_span: Span, substr: &Substructure) -> P<Expr> {
@ -196,5 +196,5 @@ fn cs_from(name: &str, cx: &mut ExtCtxt, trait_span: Span, substr: &Substructure
pub fn plugin_registrar(reg: &mut Registry) { pub fn plugin_registrar(reg: &mut Registry) {
reg.register_syntax_extension( reg.register_syntax_extension(
token::intern("derive_NumFromPrimitive"), token::intern("derive_NumFromPrimitive"),
Decorator(Box::new(expand_deriving_from_primitive))); MultiDecorator(Box::new(expand_deriving_from_primitive)));
} }