rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Let MultiItemDecorator take &Annotatable (fixes #25683)

Browse Source
This commit is contained in:
Manish Goregaokar
2015-05-22 21:10:14 +05:30
parent 59ba55ddbd
commit 6bc5a92484
18 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libsyntax/ext/base.rs
View File

@@ -154,18 +154,18 @@ pub trait MultiItemDecorator {
ecx: &mut ExtCtxt,
sp: Span,
meta_item: &ast::MetaItem,
item: Annotatable,
item: &Annotatable,
push: &mut FnMut(Annotatable));
}
impl<F> MultiItemDecorator for F
where F : Fn(&mut ExtCtxt, Span, &ast::MetaItem, Annotatable, &mut FnMut(Annotatable))
where F : Fn(&mut ExtCtxt, Span, &ast::MetaItem, &Annotatable, &mut FnMut(Annotatable))
{
fn expand(&self,
ecx: &mut ExtCtxt,
sp: Span,
meta_item: &ast::MetaItem,
item: Annotatable,
item: &Annotatable,
push: &mut FnMut(Annotatable)) {
(*self)(ecx, sp, meta_item, item, push)
}

6
src/libsyntax/ext/deriving/bounds.rs
View File

@@ -17,7 +17,7 @@ use ext::deriving::generic::ty::*;
pub fn expand_deriving_unsafe_bound(cx: &mut ExtCtxt,
span: Span,
_: &MetaItem,
_: Annotatable,
_: &Annotatable,
_: &mut FnMut(Annotatable))
{
cx.span_err(span, "this unsafe trait should be implemented explicitly");
@@ -26,7 +26,7 @@ pub fn expand_deriving_unsafe_bound(cx: &mut ExtCtxt,
pub fn expand_deriving_copy(cx: &mut ExtCtxt,
span: Span,
mitem: &MetaItem,
item: Annotatable,
item: &Annotatable,
push: &mut FnMut(Annotatable))
{
let path = Path::new(vec![
@@ -45,5 +45,5 @@ pub fn expand_deriving_copy(cx: &mut ExtCtxt,
associated_types: Vec::new(),
};
trait_def.expand(cx, mitem, &item, push);
trait_def.expand(cx, mitem, item, push);
}

4
src/libsyntax/ext/deriving/clone.rs
View File

@@ -20,7 +20,7 @@ use ptr::P;
pub fn expand_deriving_clone(cx: &mut ExtCtxt,
span: Span,
mitem: &MetaItem,
item: Annotatable,
item: &Annotatable,
push: &mut FnMut(Annotatable))
{
let inline = cx.meta_word(span, InternedString::new("inline"));
@@ -48,7 +48,7 @@ pub fn expand_deriving_clone(cx: &mut ExtCtxt,
associated_types: Vec::new(),
};
trait_def.expand(cx, mitem, &item, push)
trait_def.expand(cx, mitem, item, push)
}
fn cs_clone(

4
src/libsyntax/ext/deriving/cmp/eq.rs
View File

@@ -20,7 +20,7 @@ use ptr::P;
pub fn expand_deriving_eq(cx: &mut ExtCtxt,
span: Span,
mitem: &MetaItem,
item: Annotatable,
item: &Annotatable,
push: &mut FnMut(Annotatable))
{
fn cs_total_eq_assert(cx: &mut ExtCtxt, span: Span, substr: &Substructure) -> P<Expr> {
@@ -67,5 +67,5 @@ pub fn expand_deriving_eq(cx: &mut ExtCtxt,
),
associated_types: Vec::new(),
};
trait_def.expand(cx, mitem, &item, push)
trait_def.expand(cx, mitem, item, push)
}

4
src/libsyntax/ext/deriving/cmp/ord.rs
View File

@@ -21,7 +21,7 @@ use ptr::P;
pub fn expand_deriving_ord(cx: &mut ExtCtxt,
span: Span,
mitem: &MetaItem,
item: Annotatable,
item: &Annotatable,
push: &mut FnMut(Annotatable))
{
let inline = cx.meta_word(span, InternedString::new("inline"));
@@ -49,7 +49,7 @@ pub fn expand_deriving_ord(cx: &mut ExtCtxt,
associated_types: Vec::new(),
};
trait_def.expand(cx, mitem, &item, push)
trait_def.expand(cx, mitem, item, push)
}

4
src/libsyntax/ext/deriving/cmp/partial_eq.rs
View File

@@ -20,7 +20,7 @@ use ptr::P;
pub fn expand_deriving_partial_eq(cx: &mut ExtCtxt,
span: Span,
mitem: &MetaItem,
item: Annotatable,
item: &Annotatable,
push: &mut FnMut(Annotatable))
{
// structures are equal if all fields are equal, and non equal, if
@@ -91,5 +91,5 @@ pub fn expand_deriving_partial_eq(cx: &mut ExtCtxt,
),
associated_types: Vec::new(),
};
trait_def.expand(cx, mitem, &item, push)
trait_def.expand(cx, mitem, item, push)
}

4
src/libsyntax/ext/deriving/cmp/partial_ord.rs
View File

@@ -23,7 +23,7 @@ use ptr::P;
pub fn expand_deriving_partial_ord(cx: &mut ExtCtxt,
span: Span,
mitem: &MetaItem,
item: Annotatable,
item: &Annotatable,
push: &mut FnMut(Annotatable))
{
macro_rules! md {
@@ -82,7 +82,7 @@ pub fn expand_deriving_partial_ord(cx: &mut ExtCtxt,
],
associated_types: Vec::new(),
};
trait_def.expand(cx, mitem, &item, push)
trait_def.expand(cx, mitem, item, push)
}
#[derive(Copy, Clone)]

8
src/libsyntax/ext/deriving/decodable.rs
View File

@@ -24,7 +24,7 @@ use ptr::P;
pub fn expand_deriving_rustc_decodable(cx: &mut ExtCtxt,
span: Span,
mitem: &MetaItem,
item: Annotatable,
item: &Annotatable,
push: &mut FnMut(Annotatable))
{
expand_deriving_decodable_imp(cx, span, mitem, item, push, "rustc_serialize")
@@ -33,7 +33,7 @@ pub fn expand_deriving_rustc_decodable(cx: &mut ExtCtxt,
pub fn expand_deriving_decodable(cx: &mut ExtCtxt,
span: Span,
mitem: &MetaItem,
item: Annotatable,
item: &Annotatable,
push: &mut FnMut(Annotatable))
{
expand_deriving_decodable_imp(cx, span, mitem, item, push, "serialize")
@@ -42,7 +42,7 @@ pub fn expand_deriving_decodable(cx: &mut ExtCtxt,
fn expand_deriving_decodable_imp(cx: &mut ExtCtxt,
span: Span,
mitem: &MetaItem,
item: Annotatable,
item: &Annotatable,
push: &mut FnMut(Annotatable),
krate: &'static str)
{
@@ -88,7 +88,7 @@ fn expand_deriving_decodable_imp(cx: &mut ExtCtxt,
associated_types: Vec::new(),
};
trait_def.expand(cx, mitem, &item, push)
trait_def.expand(cx, mitem, item, push)
}
fn decodable_substructure(cx: &mut ExtCtxt, trait_span: Span,

4
src/libsyntax/ext/deriving/default.rs
View File

@@ -20,7 +20,7 @@ use ptr::P;
pub fn expand_deriving_default(cx: &mut ExtCtxt,
span: Span,
mitem: &MetaItem,
item: Annotatable,
item: &Annotatable,
push: &mut FnMut(Annotatable))
{
let inline = cx.meta_word(span, InternedString::new("inline"));
@@ -47,7 +47,7 @@ pub fn expand_deriving_default(cx: &mut ExtCtxt,
),
associated_types: Vec::new(),
};
trait_def.expand(cx, mitem, &item, push)
trait_def.expand(cx, mitem, item, push)
}
fn default_substructure(cx: &mut ExtCtxt, trait_span: Span, substr: &Substructure) -> P<Expr> {

8
src/libsyntax/ext/deriving/encodable.rs
View File

@@ -100,7 +100,7 @@ use ptr::P;
pub fn expand_deriving_rustc_encodable(cx: &mut ExtCtxt,
span: Span,
mitem: &MetaItem,
item: Annotatable,
item: &Annotatable,
push: &mut FnMut(Annotatable))
{
expand_deriving_encodable_imp(cx, span, mitem, item, push, "rustc_serialize")
@@ -109,7 +109,7 @@ pub fn expand_deriving_rustc_encodable(cx: &mut ExtCtxt,
pub fn expand_deriving_encodable(cx: &mut ExtCtxt,
span: Span,
mitem: &MetaItem,
item: Annotatable,
item: &Annotatable,
push: &mut FnMut(Annotatable))
{
expand_deriving_encodable_imp(cx, span, mitem, item, push, "serialize")
@@ -118,7 +118,7 @@ pub fn expand_deriving_encodable(cx: &mut ExtCtxt,
fn expand_deriving_encodable_imp(cx: &mut ExtCtxt,
span: Span,
mitem: &MetaItem,
item: Annotatable,
item: &Annotatable,
push: &mut FnMut(Annotatable),
krate: &'static str)
{
@@ -164,7 +164,7 @@ fn expand_deriving_encodable_imp(cx: &mut ExtCtxt,
associated_types: Vec::new(),
};
trait_def.expand(cx, mitem, &item, push)
trait_def.expand(cx, mitem, item, push)
}
fn encodable_substructure(cx: &mut ExtCtxt, trait_span: Span,

4
src/libsyntax/ext/deriving/hash.rs
View File

@@ -19,7 +19,7 @@ use ptr::P;
pub fn expand_deriving_hash(cx: &mut ExtCtxt,
span: Span,
mitem: &MetaItem,
item: Annotatable,
item: &Annotatable,
push: &mut FnMut(Annotatable))
{
@@ -53,7 +53,7 @@ pub fn expand_deriving_hash(cx: &mut ExtCtxt,
associated_types: Vec::new(),
};
hash_trait_def.expand(cx, mitem, &item, push);
hash_trait_def.expand(cx, mitem, item, push);
}
fn hash_substructure(cx: &mut ExtCtxt, trait_span: Span, substr: &Substructure) -> P<Expr> {

2
src/libsyntax/ext/deriving/mod.rs
View File

@@ -134,7 +134,7 @@ macro_rules! derive_traits {
ecx: &mut ExtCtxt,
sp: Span,
mitem: &MetaItem,
annotatable: Annotatable,
annotatable: &Annotatable,
push: &mut FnMut(Annotatable)) {
warn_if_deprecated(ecx, sp, $name);
$func(ecx, sp, mitem, annotatable, push);

4
src/libsyntax/ext/deriving/primitive.rs
View File

@@ -21,7 +21,7 @@ use ptr::P;
pub fn expand_deriving_from_primitive(cx: &mut ExtCtxt,
span: Span,
mitem: &MetaItem,
item: Annotatable,
item: &Annotatable,
push: &mut FnMut(Annotatable))
{
let inline = cx.meta_word(span, InternedString::new("inline"));
@@ -69,7 +69,7 @@ pub fn expand_deriving_from_primitive(cx: &mut ExtCtxt,
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> {

4
src/libsyntax/ext/deriving/show.rs
View File

@@ -21,7 +21,7 @@ use ptr::P;
pub fn expand_deriving_show(cx: &mut ExtCtxt,
span: Span,
mitem: &MetaItem,
item: Annotatable,
item: &Annotatable,
push: &mut FnMut(Annotatable))
{
// &mut ::std::fmt::Formatter
@@ -50,7 +50,7 @@ pub fn expand_deriving_show(cx: &mut ExtCtxt,
],
associated_types: Vec::new(),
};
trait_def.expand(cx, mitem, &item, push)
trait_def.expand(cx, mitem, item, push)
}
/// We use the debug builders to do the heavy lifting here

2
src/libsyntax/ext/expand.rs
View File

@@ -1212,7 +1212,7 @@ fn expand_decorators(a: Annotatable,
dec.expand(fld.cx,
attr.span,
&attr.node.value,
a.clone(),
&a,
&mut |ann| items.push(ann));
decorator_items.extend(items.into_iter()
.flat_map(|ann| expand_annotatable(ann, fld).into_iter()));

4
src/test/auxiliary/custom_derive_plugin.rs
View File

@@ -37,7 +37,7 @@ pub fn plugin_registrar(reg: &mut Registry) {
fn expand(cx: &mut ExtCtxt,
span: Span,
mitem: &ast::MetaItem,
item: Annotatable,
item: &Annotatable,
push: &mut FnMut(Annotatable)) {
let trait_def = TraitDef {
span: span,
@@ -71,5 +71,5 @@ fn expand(cx: &mut ExtCtxt,
],
};
trait_def.expand(cx, mitem, &item, push)
trait_def.expand(cx, mitem, item, push)
}

4
src/test/auxiliary/custom_derive_plugin_attr.rs
View File

@@ -39,7 +39,7 @@ pub fn plugin_registrar(reg: &mut Registry) {
fn expand(cx: &mut ExtCtxt,
span: Span,
mitem: &ast::MetaItem,
item: Annotatable,
item: &Annotatable,
push: &mut FnMut(Annotatable)) {
let trait_def = TraitDef {
span: span,
@@ -62,7 +62,7 @@ fn expand(cx: &mut ExtCtxt,
],
};
trait_def.expand(cx, mitem, &item, push)
trait_def.expand(cx, mitem, item, push)
}
// Mostly copied from syntax::ext::deriving::hash

2
src/test/auxiliary/macro_crate_test.rs
View File

@@ -108,7 +108,7 @@ fn expand_into_foo_multi(cx: &mut ExtCtxt,
fn expand_duplicate(cx: &mut ExtCtxt,
sp: Span,
mi: &MetaItem,
it: Annotatable,
it: &Annotatable,
push: &mut FnMut(Annotatable))
{
let copy_name = match mi.node {