Skip to content

Let MultiItemDecorator take &Annotatable #25710

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 23, 2015
Merged

Let MultiItemDecorator take &Annotatable #25710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/libsyntax/ext/base.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
6 changes: 3 additions & 3 deletions src/libsyntax/ext/deriving/bounds.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand All @@ -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![
Expand All @@ -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 changes: 2 additions & 2 deletions src/libsyntax/ext/deriving/clone.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"));
Expand Down Expand Up @@ -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(
Expand Down
4 changes: 2 additions & 2 deletions src/libsyntax/ext/deriving/cmp/eq.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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> {
Expand Down Expand Up @@ -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 changes: 2 additions & 2 deletions src/libsyntax/ext/deriving/cmp/ord.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"));
Expand Down Expand Up @@ -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)
}


Expand Down
4 changes: 2 additions & 2 deletions src/libsyntax/ext/deriving/cmp/partial_eq.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 changes: 2 additions & 2 deletions src/libsyntax/ext/deriving/cmp/partial_ord.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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)]
Expand Down
8 changes: 4 additions & 4 deletions src/libsyntax/ext/deriving/decodable.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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")
Expand All @@ -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)
{
Expand Down Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions src/libsyntax/ext/deriving/default.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"));
Expand All @@ -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> {
Expand Down
8 changes: 4 additions & 4 deletions src/libsyntax/ext/deriving/encodable.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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")
Expand All @@ -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)
{
Expand Down Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions src/libsyntax/ext/deriving/hash.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
{

Expand Down Expand Up @@ -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> {
Expand Down
2 changes: 1 addition & 1 deletion src/libsyntax/ext/deriving/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions src/libsyntax/ext/deriving/primitive.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"));
Expand Down Expand Up @@ -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> {
Expand Down
4 changes: 2 additions & 2 deletions src/libsyntax/ext/deriving/show.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/libsyntax/ext/expand.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()));
Expand Down
4 changes: 2 additions & 2 deletions src/test/auxiliary/custom_derive_plugin.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -71,5 +71,5 @@ fn expand(cx: &mut ExtCtxt,
],
};

trait_def.expand(cx, mitem, &item, push)
trait_def.expand(cx, mitem, item, push)
}
4 changes: 2 additions & 2 deletions src/test/auxiliary/custom_derive_plugin_attr.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/test/auxiliary/macro_crate_test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down