mirror of
https://github.com/servo/servo.git
synced 2025-08-05 13:40:08 +01:00
Remove all Arc-less ignores, force reasons, ignore_heap_size_of
This commit is contained in:
parent
5447d2af3d
commit
13b4bcfbb7
7 changed files with 97 additions and 82 deletions
81
components/plugins/heap_size.rs
Normal file
81
components/plugins/heap_size.rs
Normal file
|
@ -0,0 +1,81 @@
|
|||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
//! Handles the auto-deriving for `#[derive(HeapSizeOf)]`
|
||||
//!
|
||||
//! This provides the `#[derive(HeapSizeOf)]` decorator, which
|
||||
//! generates a `HeapSizeOf` implementation that adds up
|
||||
//! calls to heap_size_of_children() for all the fields
|
||||
//! of a struct or enum variant.
|
||||
//!
|
||||
//! Fields marked `#[ignore_heap_size_of = "reason"]` will
|
||||
//! be ignored in this calculation. Providing a reason is compulsory.
|
||||
|
||||
|
||||
use syntax::ext::base::{Annotatable, ExtCtxt};
|
||||
use syntax::codemap::Span;
|
||||
use syntax::ptr::P;
|
||||
use syntax::ast::*;
|
||||
use syntax::attr::AttrMetaMethods;
|
||||
use syntax::ext::build::AstBuilder;
|
||||
use syntax::ext::deriving::generic::*;
|
||||
|
||||
pub fn expand_heap_size(cx: &mut ExtCtxt, span: Span, mitem: &MetaItem,
|
||||
item: Annotatable, push: &mut FnMut(Annotatable)) {
|
||||
let trait_def = TraitDef {
|
||||
span: span,
|
||||
attributes: Vec::new(),
|
||||
path: ty::Path::new(vec!("util", "mem", "HeapSizeOf")),
|
||||
additional_bounds: Vec::new(),
|
||||
generics: ty::LifetimeBounds::empty(),
|
||||
methods: vec![
|
||||
MethodDef {
|
||||
name: "heap_size_of_children",
|
||||
generics: ty::LifetimeBounds::empty(),
|
||||
explicit_self: ty::borrowed_explicit_self(),
|
||||
args: vec!(),
|
||||
ret_ty: ty::Literal(ty::Path::new_local("usize")),
|
||||
attributes: vec!(),
|
||||
is_unsafe: false,
|
||||
combine_substructure: combine_substructure(Box::new(heap_size_substructure))
|
||||
}
|
||||
],
|
||||
associated_types: vec![],
|
||||
};
|
||||
trait_def.expand(cx, mitem, &item, push)
|
||||
}
|
||||
|
||||
/// Defines how the implementation for `heap_size_of_children()` is to be generated.
|
||||
fn heap_size_substructure(cx: &mut ExtCtxt, trait_span: Span, substr: &Substructure) -> P<Expr> {
|
||||
let fields = match *substr.fields {
|
||||
Struct(ref fs) | EnumMatching(_, _, ref fs) => fs,
|
||||
_ => cx.span_bug(trait_span, "impossible substructure in `#[derive(HeapSizeOf)]`")
|
||||
};
|
||||
|
||||
fields.iter().fold(cx.expr_usize(trait_span, 0), |acc, ref item| {
|
||||
if item.attrs.iter()
|
||||
.find(|ref a| {
|
||||
if a.check_name("ignore_heap_size_of") {
|
||||
match a.node.value.node {
|
||||
MetaNameValue(..) => (),
|
||||
_ => cx.span_err(a.span, "#[ignore_heap_size_of] \
|
||||
should have an explanation, \
|
||||
e.g. #[ignore_heap_size_of = \"foo\"]")
|
||||
}
|
||||
true
|
||||
} else {
|
||||
false
|
||||
}
|
||||
})
|
||||
.is_some() {
|
||||
acc
|
||||
} else {
|
||||
cx.expr_binary(item.span, BiAdd, acc,
|
||||
cx.expr_method_call(item.span,
|
||||
item.self_.clone(),
|
||||
substr.method_ident,
|
||||
Vec::new()))
|
||||
}
|
||||
})
|
||||
}
|
|
@ -1,58 +0,0 @@
|
|||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
use syntax::ext::base::{Annotatable, ExtCtxt};
|
||||
use syntax::codemap::Span;
|
||||
use syntax::ptr::P;
|
||||
use syntax::ast::*;
|
||||
use syntax::attr::AttrMetaMethods;
|
||||
use syntax::ext::build::AstBuilder;
|
||||
use syntax::ext::deriving::generic::*;
|
||||
|
||||
pub fn expand_heapsize(cx: &mut ExtCtxt, span: Span, mitem: &MetaItem,
|
||||
item: Annotatable, push: &mut FnMut(Annotatable)) {
|
||||
let trait_def = TraitDef {
|
||||
span: span,
|
||||
attributes: Vec::new(),
|
||||
path: ty::Path::new(vec!("util", "mem", "HeapSizeOf")),
|
||||
additional_bounds: Vec::new(),
|
||||
generics: ty::LifetimeBounds::empty(),
|
||||
methods: vec![
|
||||
MethodDef {
|
||||
name: "heap_size_of_children",
|
||||
generics: ty::LifetimeBounds::empty(),
|
||||
explicit_self: ty::borrowed_explicit_self(),
|
||||
args: vec!(),
|
||||
ret_ty: ty::Literal(ty::Path::new_local("usize")),
|
||||
attributes: vec!(),
|
||||
is_unsafe: false,
|
||||
combine_substructure: combine_substructure(Box::new(heapsize_substructure))
|
||||
}
|
||||
],
|
||||
associated_types: vec![],
|
||||
};
|
||||
trait_def.expand(cx, mitem, &item, push)
|
||||
}
|
||||
|
||||
fn heapsize_substructure(cx: &mut ExtCtxt, trait_span: Span, substr: &Substructure) -> P<Expr> {
|
||||
let fields = match *substr.fields {
|
||||
Struct(ref fs) | EnumMatching(_, _, ref fs) => fs,
|
||||
_ => cx.span_bug(trait_span, "impossible substructure in `heapsize`")
|
||||
};
|
||||
|
||||
fields.iter().fold(cx.expr_usize(trait_span, 0),
|
||||
|acc, ref item| {
|
||||
if item.attrs.iter()
|
||||
.find(|ref a| a.check_name("ignore_heap_size"))
|
||||
.is_some() {
|
||||
acc
|
||||
} else {
|
||||
cx.expr_binary(item.span, BiAdd, acc,
|
||||
cx.expr_method_call(item.span,
|
||||
item.self_.clone(),
|
||||
substr.method_ident,
|
||||
Vec::new()))
|
||||
}
|
||||
})
|
||||
}
|
|
@ -31,8 +31,8 @@ use syntax::parse::token::intern;
|
|||
// Public for documentation to show up
|
||||
/// Handles the auto-deriving for `#[jstraceable]`
|
||||
pub mod jstraceable;
|
||||
/// Handles the auto-deriving for `#[heapsize]`
|
||||
pub mod heapsize;
|
||||
/// Handles the auto-deriving for `#[derive(HeapSizeOf)]`
|
||||
pub mod heap_size;
|
||||
/// Autogenerates implementations of Reflectable on DOM structs
|
||||
pub mod reflector;
|
||||
pub mod lints;
|
||||
|
@ -45,7 +45,7 @@ pub fn plugin_registrar(reg: &mut Registry) {
|
|||
reg.register_syntax_extension(intern("dom_struct"), MultiModifier(box jstraceable::expand_dom_struct));
|
||||
reg.register_syntax_extension(intern("jstraceable"), MultiDecorator(box jstraceable::expand_jstraceable));
|
||||
reg.register_syntax_extension(intern("_generate_reflector"), MultiDecorator(box reflector::expand_reflector));
|
||||
reg.register_syntax_extension(intern("derive_HeapSizeOf"), MultiDecorator(box heapsize::expand_heapsize));
|
||||
reg.register_syntax_extension(intern("derive_HeapSizeOf"), MultiDecorator(box heap_size::expand_heap_size));
|
||||
reg.register_macro("to_lower", casing::expand_lower);
|
||||
reg.register_macro("to_upper", casing::expand_upper);
|
||||
reg.register_lint_pass(box lints::transmute_type::TransmutePass as LintPassObject);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue