2019-10-16 10:59:30 +02:00
|
|
|
use crate::base::ExtCtxt;
|
|
|
|
use crate::expand::{AstFragment, AstFragmentKind};
|
|
|
|
|
2020-04-27 23:26:11 +05:30
|
|
|
use rustc_ast as ast;
|
2020-02-29 20:37:32 +03:00
|
|
|
use rustc_ast::mut_visit::*;
|
|
|
|
use rustc_ast::ptr::P;
|
2020-08-21 19:11:00 -04:00
|
|
|
use rustc_span::source_map::DUMMY_SP;
|
2020-04-19 13:00:18 +02:00
|
|
|
use rustc_span::symbol::Ident;
|
2019-02-07 02:33:01 +09:00
|
|
|
|
|
|
|
use smallvec::{smallvec, SmallVec};
|
2016-08-29 05:32:41 +00:00
|
|
|
|
2018-08-18 13:55:43 +03:00
|
|
|
use rustc_data_structures::fx::FxHashMap;
|
2016-08-29 05:32:41 +00:00
|
|
|
|
2019-12-22 17:42:04 -05:00
|
|
|
pub fn placeholder(
|
|
|
|
kind: AstFragmentKind,
|
|
|
|
id: ast::NodeId,
|
|
|
|
vis: Option<ast::Visibility>,
|
|
|
|
) -> AstFragment {
|
2020-02-29 19:32:20 +03:00
|
|
|
fn mac_placeholder() -> ast::MacCall {
|
|
|
|
ast::MacCall {
|
2020-08-21 18:51:23 -04:00
|
|
|
path: ast::Path { span: DUMMY_SP, segments: Vec::new(), tokens: None },
|
2019-12-01 02:25:32 +03:00
|
|
|
args: P(ast::MacArgs::Empty),
|
2019-07-18 18:36:19 -07:00
|
|
|
prior_type_ascription: None,
|
2019-08-15 02:13:53 +03:00
|
|
|
}
|
2016-08-29 05:32:41 +00:00
|
|
|
}
|
|
|
|
|
2020-04-19 13:00:18 +02:00
|
|
|
let ident = Ident::invalid();
|
2016-08-29 05:32:41 +00:00
|
|
|
let attrs = Vec::new();
|
2020-08-21 19:11:00 -04:00
|
|
|
let vis = vis.unwrap_or(ast::Visibility {
|
|
|
|
span: DUMMY_SP,
|
|
|
|
kind: ast::VisibilityKind::Inherited,
|
|
|
|
tokens: None,
|
|
|
|
});
|
2016-08-29 05:32:41 +00:00
|
|
|
let span = DUMMY_SP;
|
2019-12-22 17:42:04 -05:00
|
|
|
let expr_placeholder = || {
|
|
|
|
P(ast::Expr {
|
|
|
|
id,
|
|
|
|
span,
|
|
|
|
attrs: ast::AttrVec::new(),
|
2020-02-29 19:32:20 +03:00
|
|
|
kind: ast::ExprKind::MacCall(mac_placeholder()),
|
2020-05-19 16:56:20 -04:00
|
|
|
tokens: None,
|
2019-12-22 17:42:04 -05:00
|
|
|
})
|
|
|
|
};
|
2020-08-21 18:18:04 -04:00
|
|
|
let ty =
|
|
|
|
|| P(ast::Ty { id, kind: ast::TyKind::MacCall(mac_placeholder()), span, tokens: None });
|
2020-07-27 18:02:29 -04:00
|
|
|
let pat =
|
|
|
|
|| P(ast::Pat { id, kind: ast::PatKind::MacCall(mac_placeholder()), span, tokens: None });
|
2016-08-29 05:32:41 +00:00
|
|
|
|
|
|
|
match kind {
|
2018-06-20 02:08:08 +03:00
|
|
|
AstFragmentKind::Expr => AstFragment::Expr(expr_placeholder()),
|
|
|
|
AstFragmentKind::OptExpr => AstFragment::OptExpr(Some(expr_placeholder())),
|
2018-08-13 22:15:16 +03:00
|
|
|
AstFragmentKind::Items => AstFragment::Items(smallvec![P(ast::Item {
|
2019-12-22 17:42:04 -05:00
|
|
|
id,
|
|
|
|
span,
|
|
|
|
ident,
|
|
|
|
vis,
|
|
|
|
attrs,
|
2020-02-29 19:32:20 +03:00
|
|
|
kind: ast::ItemKind::MacCall(mac_placeholder()),
|
2017-07-10 17:44:46 -07:00
|
|
|
tokens: None,
|
2018-08-13 22:15:16 +03:00
|
|
|
})]),
|
2019-12-12 16:41:18 +11:00
|
|
|
AstFragmentKind::TraitItems => AstFragment::TraitItems(smallvec![P(ast::AssocItem {
|
2019-12-22 17:42:04 -05:00
|
|
|
id,
|
|
|
|
span,
|
|
|
|
ident,
|
|
|
|
vis,
|
|
|
|
attrs,
|
2020-02-29 19:32:20 +03:00
|
|
|
kind: ast::AssocItemKind::MacCall(mac_placeholder()),
|
2017-07-12 09:50:05 -07:00
|
|
|
tokens: None,
|
2019-12-12 16:41:18 +11:00
|
|
|
})]),
|
|
|
|
AstFragmentKind::ImplItems => AstFragment::ImplItems(smallvec![P(ast::AssocItem {
|
2019-12-22 17:42:04 -05:00
|
|
|
id,
|
|
|
|
span,
|
|
|
|
ident,
|
|
|
|
vis,
|
|
|
|
attrs,
|
2020-02-29 19:32:20 +03:00
|
|
|
kind: ast::AssocItemKind::MacCall(mac_placeholder()),
|
2017-07-12 09:50:05 -07:00
|
|
|
tokens: None,
|
2019-12-12 16:41:18 +11:00
|
|
|
})]),
|
|
|
|
AstFragmentKind::ForeignItems => {
|
|
|
|
AstFragment::ForeignItems(smallvec![P(ast::ForeignItem {
|
|
|
|
id,
|
|
|
|
span,
|
|
|
|
ident,
|
|
|
|
vis,
|
|
|
|
attrs,
|
2020-02-29 19:32:20 +03:00
|
|
|
kind: ast::ForeignItemKind::MacCall(mac_placeholder()),
|
2019-12-12 16:41:18 +11:00
|
|
|
tokens: None,
|
|
|
|
})])
|
|
|
|
}
|
2020-02-29 19:32:20 +03:00
|
|
|
AstFragmentKind::Pat => AstFragment::Pat(P(ast::Pat {
|
|
|
|
id,
|
|
|
|
span,
|
|
|
|
kind: ast::PatKind::MacCall(mac_placeholder()),
|
2020-07-27 18:02:29 -04:00
|
|
|
tokens: None,
|
2020-02-29 19:32:20 +03:00
|
|
|
})),
|
2020-08-21 18:18:04 -04:00
|
|
|
AstFragmentKind::Ty => AstFragment::Ty(P(ast::Ty {
|
|
|
|
id,
|
|
|
|
span,
|
|
|
|
kind: ast::TyKind::MacCall(mac_placeholder()),
|
|
|
|
tokens: None,
|
|
|
|
})),
|
2018-08-13 22:15:16 +03:00
|
|
|
AstFragmentKind::Stmts => AstFragment::Stmts(smallvec![{
|
2020-08-30 18:38:32 -04:00
|
|
|
let mac = P(ast::MacCallStmt {
|
|
|
|
mac: mac_placeholder(),
|
|
|
|
style: ast::MacStmtStyle::Braces,
|
|
|
|
attrs: ast::AttrVec::new(),
|
2020-11-17 14:27:44 -05:00
|
|
|
tokens: None,
|
2020-08-30 18:38:32 -04:00
|
|
|
});
|
2020-11-17 14:27:44 -05:00
|
|
|
ast::Stmt { id, span, kind: ast::StmtKind::MacCall(mac) }
|
2018-08-13 22:15:16 +03:00
|
|
|
}]),
|
2019-12-22 17:42:04 -05:00
|
|
|
AstFragmentKind::Arms => AstFragment::Arms(smallvec![ast::Arm {
|
|
|
|
attrs: Default::default(),
|
|
|
|
body: expr_placeholder(),
|
|
|
|
guard: None,
|
|
|
|
id,
|
|
|
|
pat: pat(),
|
|
|
|
span,
|
|
|
|
is_placeholder: true,
|
|
|
|
}]),
|
2021-03-16 00:36:07 +03:00
|
|
|
AstFragmentKind::Fields => AstFragment::Fields(smallvec![ast::ExprField {
|
2019-12-22 17:42:04 -05:00
|
|
|
attrs: Default::default(),
|
|
|
|
expr: expr_placeholder(),
|
|
|
|
id,
|
|
|
|
ident,
|
|
|
|
is_shorthand: false,
|
|
|
|
span,
|
|
|
|
is_placeholder: true,
|
|
|
|
}]),
|
2021-03-16 00:36:07 +03:00
|
|
|
AstFragmentKind::FieldPats => AstFragment::FieldPats(smallvec![ast::PatField {
|
2019-12-22 17:42:04 -05:00
|
|
|
attrs: Default::default(),
|
|
|
|
id,
|
|
|
|
ident,
|
|
|
|
is_shorthand: false,
|
|
|
|
pat: pat(),
|
|
|
|
span,
|
|
|
|
is_placeholder: true,
|
|
|
|
}]),
|
2019-09-09 09:26:25 -03:00
|
|
|
AstFragmentKind::GenericParams => AstFragment::GenericParams(smallvec![{
|
|
|
|
ast::GenericParam {
|
|
|
|
attrs: Default::default(),
|
|
|
|
bounds: Default::default(),
|
|
|
|
id,
|
|
|
|
ident,
|
|
|
|
is_placeholder: true,
|
|
|
|
kind: ast::GenericParamKind::Lifetime,
|
|
|
|
}
|
|
|
|
}]),
|
2019-12-22 17:42:04 -05:00
|
|
|
AstFragmentKind::Params => AstFragment::Params(smallvec![ast::Param {
|
|
|
|
attrs: Default::default(),
|
|
|
|
id,
|
|
|
|
pat: pat(),
|
|
|
|
span,
|
|
|
|
ty: ty(),
|
|
|
|
is_placeholder: true,
|
|
|
|
}]),
|
2021-03-16 00:36:07 +03:00
|
|
|
AstFragmentKind::StructFields => AstFragment::StructFields(smallvec![ast::FieldDef {
|
2019-12-22 17:42:04 -05:00
|
|
|
attrs: Default::default(),
|
|
|
|
id,
|
|
|
|
ident: None,
|
|
|
|
span,
|
|
|
|
ty: ty(),
|
|
|
|
vis,
|
|
|
|
is_placeholder: true,
|
|
|
|
}]),
|
|
|
|
AstFragmentKind::Variants => AstFragment::Variants(smallvec![ast::Variant {
|
|
|
|
attrs: Default::default(),
|
|
|
|
data: ast::VariantData::Struct(Default::default(), false),
|
|
|
|
disr_expr: None,
|
|
|
|
id,
|
|
|
|
ident,
|
|
|
|
span,
|
|
|
|
vis,
|
|
|
|
is_placeholder: true,
|
|
|
|
}]),
|
2016-08-29 05:32:41 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-06-14 19:39:39 +03:00
|
|
|
pub struct PlaceholderExpander<'a, 'b> {
|
2018-08-18 13:55:43 +03:00
|
|
|
expanded_fragments: FxHashMap<ast::NodeId, AstFragment>,
|
2016-09-05 00:10:27 +00:00
|
|
|
cx: &'a mut ExtCtxt<'b>,
|
2016-09-06 05:42:45 +00:00
|
|
|
monotonic: bool,
|
2016-08-29 05:32:41 +00:00
|
|
|
}
|
|
|
|
|
2016-09-05 00:10:27 +00:00
|
|
|
impl<'a, 'b> PlaceholderExpander<'a, 'b> {
|
2016-09-06 05:42:45 +00:00
|
|
|
pub fn new(cx: &'a mut ExtCtxt<'b>, monotonic: bool) -> Self {
|
2019-12-22 17:42:04 -05:00
|
|
|
PlaceholderExpander { cx, expanded_fragments: FxHashMap::default(), monotonic }
|
2016-08-29 05:32:41 +00:00
|
|
|
}
|
|
|
|
|
2019-10-10 01:41:47 +03:00
|
|
|
pub fn add(&mut self, id: ast::NodeId, mut fragment: AstFragment) {
|
Overhaul `syntax::fold::Folder`.
This commit changes `syntax::fold::Folder` from a functional style
(where most methods take a `T` and produce a new `T`) to a more
imperative style (where most methods take and modify a `&mut T`), and
renames it `syntax::mut_visit::MutVisitor`.
The first benefit is speed. The functional style does not require any
reallocations, due to the use of `P::map` and
`MoveMap::move_{,flat_}map`. However, every field in the AST must be
overwritten; even those fields that are unchanged are overwritten with
the same value. This causes a lot of unnecessary memory writes. The
imperative style reduces instruction counts by 1--3% across a wide range
of workloads, particularly incremental workloads.
The second benefit is conciseness; the imperative style is usually more
concise. E.g. compare the old functional style:
```
fn fold_abc(&mut self, abc: ABC) {
ABC {
a: fold_a(abc.a),
b: fold_b(abc.b),
c: abc.c,
}
}
```
with the imperative style:
```
fn visit_abc(&mut self, ABC { a, b, c: _ }: &mut ABC) {
visit_a(a);
visit_b(b);
}
```
(The reductions get larger in more complex examples.)
Overall, the patch removes over 200 lines of code -- even though the new
code has more comments -- and a lot of the remaining lines have fewer
characters.
Some notes:
- The old style used methods called `fold_*`. The new style mostly uses
methods called `visit_*`, but there are a few methods that map a `T`
to something other than a `T`, which are called `flat_map_*` (`T` maps
to multiple `T`s) or `filter_map_*` (`T` maps to 0 or 1 `T`s).
- `move_map.rs`/`MoveMap`/`move_map`/`move_flat_map` are renamed
`map_in_place.rs`/`MapInPlace`/`map_in_place`/`flat_map_in_place` to
reflect their slightly changed signatures.
- Although this commit renames the `fold` module as `mut_visit`, it
keeps it in the `fold.rs` file, so as not to confuse git. The next
commit will rename the file.
2019-02-05 15:20:55 +11:00
|
|
|
fragment.mut_visit_with(self);
|
2018-06-20 02:08:08 +03:00
|
|
|
self.expanded_fragments.insert(id, fragment);
|
2016-09-02 03:35:59 +00:00
|
|
|
}
|
|
|
|
|
2018-06-20 02:08:08 +03:00
|
|
|
fn remove(&mut self, id: ast::NodeId) -> AstFragment {
|
|
|
|
self.expanded_fragments.remove(&id).unwrap()
|
2016-08-29 05:32:41 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Overhaul `syntax::fold::Folder`.
This commit changes `syntax::fold::Folder` from a functional style
(where most methods take a `T` and produce a new `T`) to a more
imperative style (where most methods take and modify a `&mut T`), and
renames it `syntax::mut_visit::MutVisitor`.
The first benefit is speed. The functional style does not require any
reallocations, due to the use of `P::map` and
`MoveMap::move_{,flat_}map`. However, every field in the AST must be
overwritten; even those fields that are unchanged are overwritten with
the same value. This causes a lot of unnecessary memory writes. The
imperative style reduces instruction counts by 1--3% across a wide range
of workloads, particularly incremental workloads.
The second benefit is conciseness; the imperative style is usually more
concise. E.g. compare the old functional style:
```
fn fold_abc(&mut self, abc: ABC) {
ABC {
a: fold_a(abc.a),
b: fold_b(abc.b),
c: abc.c,
}
}
```
with the imperative style:
```
fn visit_abc(&mut self, ABC { a, b, c: _ }: &mut ABC) {
visit_a(a);
visit_b(b);
}
```
(The reductions get larger in more complex examples.)
Overall, the patch removes over 200 lines of code -- even though the new
code has more comments -- and a lot of the remaining lines have fewer
characters.
Some notes:
- The old style used methods called `fold_*`. The new style mostly uses
methods called `visit_*`, but there are a few methods that map a `T`
to something other than a `T`, which are called `flat_map_*` (`T` maps
to multiple `T`s) or `filter_map_*` (`T` maps to 0 or 1 `T`s).
- `move_map.rs`/`MoveMap`/`move_map`/`move_flat_map` are renamed
`map_in_place.rs`/`MapInPlace`/`map_in_place`/`flat_map_in_place` to
reflect their slightly changed signatures.
- Although this commit renames the `fold` module as `mut_visit`, it
keeps it in the `fold.rs` file, so as not to confuse git. The next
commit will rename the file.
2019-02-05 15:20:55 +11:00
|
|
|
impl<'a, 'b> MutVisitor for PlaceholderExpander<'a, 'b> {
|
2019-09-09 09:26:25 -03:00
|
|
|
fn flat_map_arm(&mut self, arm: ast::Arm) -> SmallVec<[ast::Arm; 1]> {
|
|
|
|
if arm.is_placeholder {
|
|
|
|
self.remove(arm.id).make_arms()
|
|
|
|
} else {
|
|
|
|
noop_flat_map_arm(arm, self)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-03-16 00:36:07 +03:00
|
|
|
fn flat_map_expr_field(&mut self, field: ast::ExprField) -> SmallVec<[ast::ExprField; 1]> {
|
2019-09-09 09:26:25 -03:00
|
|
|
if field.is_placeholder {
|
2021-03-16 00:36:07 +03:00
|
|
|
self.remove(field.id).make_expr_fields()
|
2019-09-09 09:26:25 -03:00
|
|
|
} else {
|
2021-03-16 00:36:07 +03:00
|
|
|
noop_flat_map_expr_field(field, self)
|
2019-09-09 09:26:25 -03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-03-16 00:36:07 +03:00
|
|
|
fn flat_map_pat_field(&mut self, fp: ast::PatField) -> SmallVec<[ast::PatField; 1]> {
|
2019-09-09 09:26:25 -03:00
|
|
|
if fp.is_placeholder {
|
2021-03-16 00:36:07 +03:00
|
|
|
self.remove(fp.id).make_pat_fields()
|
2019-09-09 09:26:25 -03:00
|
|
|
} else {
|
2021-03-16 00:36:07 +03:00
|
|
|
noop_flat_map_pat_field(fp, self)
|
2019-09-09 09:26:25 -03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn flat_map_generic_param(
|
|
|
|
&mut self,
|
2019-12-22 17:42:04 -05:00
|
|
|
param: ast::GenericParam,
|
|
|
|
) -> SmallVec<[ast::GenericParam; 1]> {
|
2019-09-09 09:26:25 -03:00
|
|
|
if param.is_placeholder {
|
|
|
|
self.remove(param.id).make_generic_params()
|
|
|
|
} else {
|
|
|
|
noop_flat_map_generic_param(param, self)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn flat_map_param(&mut self, p: ast::Param) -> SmallVec<[ast::Param; 1]> {
|
|
|
|
if p.is_placeholder {
|
|
|
|
self.remove(p.id).make_params()
|
|
|
|
} else {
|
|
|
|
noop_flat_map_param(p, self)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-03-16 00:36:07 +03:00
|
|
|
fn flat_map_field_def(&mut self, sf: ast::FieldDef) -> SmallVec<[ast::FieldDef; 1]> {
|
2019-09-09 09:26:25 -03:00
|
|
|
if sf.is_placeholder {
|
2021-03-16 00:36:07 +03:00
|
|
|
self.remove(sf.id).make_field_defs()
|
2019-09-09 09:26:25 -03:00
|
|
|
} else {
|
2021-03-16 00:36:07 +03:00
|
|
|
noop_flat_map_field_def(sf, self)
|
2019-09-09 09:26:25 -03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn flat_map_variant(&mut self, variant: ast::Variant) -> SmallVec<[ast::Variant; 1]> {
|
|
|
|
if variant.is_placeholder {
|
|
|
|
self.remove(variant.id).make_variants()
|
|
|
|
} else {
|
|
|
|
noop_flat_map_variant(variant, self)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Overhaul `syntax::fold::Folder`.
This commit changes `syntax::fold::Folder` from a functional style
(where most methods take a `T` and produce a new `T`) to a more
imperative style (where most methods take and modify a `&mut T`), and
renames it `syntax::mut_visit::MutVisitor`.
The first benefit is speed. The functional style does not require any
reallocations, due to the use of `P::map` and
`MoveMap::move_{,flat_}map`. However, every field in the AST must be
overwritten; even those fields that are unchanged are overwritten with
the same value. This causes a lot of unnecessary memory writes. The
imperative style reduces instruction counts by 1--3% across a wide range
of workloads, particularly incremental workloads.
The second benefit is conciseness; the imperative style is usually more
concise. E.g. compare the old functional style:
```
fn fold_abc(&mut self, abc: ABC) {
ABC {
a: fold_a(abc.a),
b: fold_b(abc.b),
c: abc.c,
}
}
```
with the imperative style:
```
fn visit_abc(&mut self, ABC { a, b, c: _ }: &mut ABC) {
visit_a(a);
visit_b(b);
}
```
(The reductions get larger in more complex examples.)
Overall, the patch removes over 200 lines of code -- even though the new
code has more comments -- and a lot of the remaining lines have fewer
characters.
Some notes:
- The old style used methods called `fold_*`. The new style mostly uses
methods called `visit_*`, but there are a few methods that map a `T`
to something other than a `T`, which are called `flat_map_*` (`T` maps
to multiple `T`s) or `filter_map_*` (`T` maps to 0 or 1 `T`s).
- `move_map.rs`/`MoveMap`/`move_map`/`move_flat_map` are renamed
`map_in_place.rs`/`MapInPlace`/`map_in_place`/`flat_map_in_place` to
reflect their slightly changed signatures.
- Although this commit renames the `fold` module as `mut_visit`, it
keeps it in the `fold.rs` file, so as not to confuse git. The next
commit will rename the file.
2019-02-05 15:20:55 +11:00
|
|
|
fn flat_map_item(&mut self, item: P<ast::Item>) -> SmallVec<[P<ast::Item>; 1]> {
|
2019-09-26 17:51:36 +01:00
|
|
|
match item.kind {
|
2020-12-31 17:59:09 +03:00
|
|
|
ast::ItemKind::MacCall(_) => self.remove(item.id).make_items(),
|
|
|
|
_ => noop_flat_map_item(item, self),
|
2016-08-29 05:32:41 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-12-12 16:41:18 +11:00
|
|
|
fn flat_map_trait_item(&mut self, item: P<ast::AssocItem>) -> SmallVec<[P<ast::AssocItem>; 1]> {
|
2019-09-26 17:07:54 +01:00
|
|
|
match item.kind {
|
2020-02-29 19:32:20 +03:00
|
|
|
ast::AssocItemKind::MacCall(_) => self.remove(item.id).make_trait_items(),
|
2019-12-01 16:58:37 +01:00
|
|
|
_ => noop_flat_map_assoc_item(item, self),
|
2016-08-29 05:32:41 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-12-12 16:41:18 +11:00
|
|
|
fn flat_map_impl_item(&mut self, item: P<ast::AssocItem>) -> SmallVec<[P<ast::AssocItem>; 1]> {
|
2019-09-26 16:38:13 +01:00
|
|
|
match item.kind {
|
2020-02-29 19:32:20 +03:00
|
|
|
ast::AssocItemKind::MacCall(_) => self.remove(item.id).make_impl_items(),
|
2019-12-01 16:58:37 +01:00
|
|
|
_ => noop_flat_map_assoc_item(item, self),
|
2016-08-29 05:32:41 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-12-12 16:41:18 +11:00
|
|
|
fn flat_map_foreign_item(
|
|
|
|
&mut self,
|
|
|
|
item: P<ast::ForeignItem>,
|
|
|
|
) -> SmallVec<[P<ast::ForeignItem>; 1]> {
|
2019-09-26 17:58:14 +01:00
|
|
|
match item.kind {
|
2020-02-29 19:32:20 +03:00
|
|
|
ast::ForeignItemKind::MacCall(_) => self.remove(item.id).make_foreign_items(),
|
Overhaul `syntax::fold::Folder`.
This commit changes `syntax::fold::Folder` from a functional style
(where most methods take a `T` and produce a new `T`) to a more
imperative style (where most methods take and modify a `&mut T`), and
renames it `syntax::mut_visit::MutVisitor`.
The first benefit is speed. The functional style does not require any
reallocations, due to the use of `P::map` and
`MoveMap::move_{,flat_}map`. However, every field in the AST must be
overwritten; even those fields that are unchanged are overwritten with
the same value. This causes a lot of unnecessary memory writes. The
imperative style reduces instruction counts by 1--3% across a wide range
of workloads, particularly incremental workloads.
The second benefit is conciseness; the imperative style is usually more
concise. E.g. compare the old functional style:
```
fn fold_abc(&mut self, abc: ABC) {
ABC {
a: fold_a(abc.a),
b: fold_b(abc.b),
c: abc.c,
}
}
```
with the imperative style:
```
fn visit_abc(&mut self, ABC { a, b, c: _ }: &mut ABC) {
visit_a(a);
visit_b(b);
}
```
(The reductions get larger in more complex examples.)
Overall, the patch removes over 200 lines of code -- even though the new
code has more comments -- and a lot of the remaining lines have fewer
characters.
Some notes:
- The old style used methods called `fold_*`. The new style mostly uses
methods called `visit_*`, but there are a few methods that map a `T`
to something other than a `T`, which are called `flat_map_*` (`T` maps
to multiple `T`s) or `filter_map_*` (`T` maps to 0 or 1 `T`s).
- `move_map.rs`/`MoveMap`/`move_map`/`move_flat_map` are renamed
`map_in_place.rs`/`MapInPlace`/`map_in_place`/`flat_map_in_place` to
reflect their slightly changed signatures.
- Although this commit renames the `fold` module as `mut_visit`, it
keeps it in the `fold.rs` file, so as not to confuse git. The next
commit will rename the file.
2019-02-05 15:20:55 +11:00
|
|
|
_ => noop_flat_map_foreign_item(item, self),
|
2018-03-10 18:16:26 -08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Overhaul `syntax::fold::Folder`.
This commit changes `syntax::fold::Folder` from a functional style
(where most methods take a `T` and produce a new `T`) to a more
imperative style (where most methods take and modify a `&mut T`), and
renames it `syntax::mut_visit::MutVisitor`.
The first benefit is speed. The functional style does not require any
reallocations, due to the use of `P::map` and
`MoveMap::move_{,flat_}map`. However, every field in the AST must be
overwritten; even those fields that are unchanged are overwritten with
the same value. This causes a lot of unnecessary memory writes. The
imperative style reduces instruction counts by 1--3% across a wide range
of workloads, particularly incremental workloads.
The second benefit is conciseness; the imperative style is usually more
concise. E.g. compare the old functional style:
```
fn fold_abc(&mut self, abc: ABC) {
ABC {
a: fold_a(abc.a),
b: fold_b(abc.b),
c: abc.c,
}
}
```
with the imperative style:
```
fn visit_abc(&mut self, ABC { a, b, c: _ }: &mut ABC) {
visit_a(a);
visit_b(b);
}
```
(The reductions get larger in more complex examples.)
Overall, the patch removes over 200 lines of code -- even though the new
code has more comments -- and a lot of the remaining lines have fewer
characters.
Some notes:
- The old style used methods called `fold_*`. The new style mostly uses
methods called `visit_*`, but there are a few methods that map a `T`
to something other than a `T`, which are called `flat_map_*` (`T` maps
to multiple `T`s) or `filter_map_*` (`T` maps to 0 or 1 `T`s).
- `move_map.rs`/`MoveMap`/`move_map`/`move_flat_map` are renamed
`map_in_place.rs`/`MapInPlace`/`map_in_place`/`flat_map_in_place` to
reflect their slightly changed signatures.
- Although this commit renames the `fold` module as `mut_visit`, it
keeps it in the `fold.rs` file, so as not to confuse git. The next
commit will rename the file.
2019-02-05 15:20:55 +11:00
|
|
|
fn visit_expr(&mut self, expr: &mut P<ast::Expr>) {
|
2019-09-26 14:39:48 +01:00
|
|
|
match expr.kind {
|
2020-02-29 19:32:20 +03:00
|
|
|
ast::ExprKind::MacCall(_) => *expr = self.remove(expr.id).make_expr(),
|
Overhaul `syntax::fold::Folder`.
This commit changes `syntax::fold::Folder` from a functional style
(where most methods take a `T` and produce a new `T`) to a more
imperative style (where most methods take and modify a `&mut T`), and
renames it `syntax::mut_visit::MutVisitor`.
The first benefit is speed. The functional style does not require any
reallocations, due to the use of `P::map` and
`MoveMap::move_{,flat_}map`. However, every field in the AST must be
overwritten; even those fields that are unchanged are overwritten with
the same value. This causes a lot of unnecessary memory writes. The
imperative style reduces instruction counts by 1--3% across a wide range
of workloads, particularly incremental workloads.
The second benefit is conciseness; the imperative style is usually more
concise. E.g. compare the old functional style:
```
fn fold_abc(&mut self, abc: ABC) {
ABC {
a: fold_a(abc.a),
b: fold_b(abc.b),
c: abc.c,
}
}
```
with the imperative style:
```
fn visit_abc(&mut self, ABC { a, b, c: _ }: &mut ABC) {
visit_a(a);
visit_b(b);
}
```
(The reductions get larger in more complex examples.)
Overall, the patch removes over 200 lines of code -- even though the new
code has more comments -- and a lot of the remaining lines have fewer
characters.
Some notes:
- The old style used methods called `fold_*`. The new style mostly uses
methods called `visit_*`, but there are a few methods that map a `T`
to something other than a `T`, which are called `flat_map_*` (`T` maps
to multiple `T`s) or `filter_map_*` (`T` maps to 0 or 1 `T`s).
- `move_map.rs`/`MoveMap`/`move_map`/`move_flat_map` are renamed
`map_in_place.rs`/`MapInPlace`/`map_in_place`/`flat_map_in_place` to
reflect their slightly changed signatures.
- Although this commit renames the `fold` module as `mut_visit`, it
keeps it in the `fold.rs` file, so as not to confuse git. The next
commit will rename the file.
2019-02-05 15:20:55 +11:00
|
|
|
_ => noop_visit_expr(expr, self),
|
2016-08-29 05:32:41 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Overhaul `syntax::fold::Folder`.
This commit changes `syntax::fold::Folder` from a functional style
(where most methods take a `T` and produce a new `T`) to a more
imperative style (where most methods take and modify a `&mut T`), and
renames it `syntax::mut_visit::MutVisitor`.
The first benefit is speed. The functional style does not require any
reallocations, due to the use of `P::map` and
`MoveMap::move_{,flat_}map`. However, every field in the AST must be
overwritten; even those fields that are unchanged are overwritten with
the same value. This causes a lot of unnecessary memory writes. The
imperative style reduces instruction counts by 1--3% across a wide range
of workloads, particularly incremental workloads.
The second benefit is conciseness; the imperative style is usually more
concise. E.g. compare the old functional style:
```
fn fold_abc(&mut self, abc: ABC) {
ABC {
a: fold_a(abc.a),
b: fold_b(abc.b),
c: abc.c,
}
}
```
with the imperative style:
```
fn visit_abc(&mut self, ABC { a, b, c: _ }: &mut ABC) {
visit_a(a);
visit_b(b);
}
```
(The reductions get larger in more complex examples.)
Overall, the patch removes over 200 lines of code -- even though the new
code has more comments -- and a lot of the remaining lines have fewer
characters.
Some notes:
- The old style used methods called `fold_*`. The new style mostly uses
methods called `visit_*`, but there are a few methods that map a `T`
to something other than a `T`, which are called `flat_map_*` (`T` maps
to multiple `T`s) or `filter_map_*` (`T` maps to 0 or 1 `T`s).
- `move_map.rs`/`MoveMap`/`move_map`/`move_flat_map` are renamed
`map_in_place.rs`/`MapInPlace`/`map_in_place`/`flat_map_in_place` to
reflect their slightly changed signatures.
- Although this commit renames the `fold` module as `mut_visit`, it
keeps it in the `fold.rs` file, so as not to confuse git. The next
commit will rename the file.
2019-02-05 15:20:55 +11:00
|
|
|
fn filter_map_expr(&mut self, expr: P<ast::Expr>) -> Option<P<ast::Expr>> {
|
2019-09-26 14:39:48 +01:00
|
|
|
match expr.kind {
|
2020-02-29 19:32:20 +03:00
|
|
|
ast::ExprKind::MacCall(_) => self.remove(expr.id).make_opt_expr(),
|
Overhaul `syntax::fold::Folder`.
This commit changes `syntax::fold::Folder` from a functional style
(where most methods take a `T` and produce a new `T`) to a more
imperative style (where most methods take and modify a `&mut T`), and
renames it `syntax::mut_visit::MutVisitor`.
The first benefit is speed. The functional style does not require any
reallocations, due to the use of `P::map` and
`MoveMap::move_{,flat_}map`. However, every field in the AST must be
overwritten; even those fields that are unchanged are overwritten with
the same value. This causes a lot of unnecessary memory writes. The
imperative style reduces instruction counts by 1--3% across a wide range
of workloads, particularly incremental workloads.
The second benefit is conciseness; the imperative style is usually more
concise. E.g. compare the old functional style:
```
fn fold_abc(&mut self, abc: ABC) {
ABC {
a: fold_a(abc.a),
b: fold_b(abc.b),
c: abc.c,
}
}
```
with the imperative style:
```
fn visit_abc(&mut self, ABC { a, b, c: _ }: &mut ABC) {
visit_a(a);
visit_b(b);
}
```
(The reductions get larger in more complex examples.)
Overall, the patch removes over 200 lines of code -- even though the new
code has more comments -- and a lot of the remaining lines have fewer
characters.
Some notes:
- The old style used methods called `fold_*`. The new style mostly uses
methods called `visit_*`, but there are a few methods that map a `T`
to something other than a `T`, which are called `flat_map_*` (`T` maps
to multiple `T`s) or `filter_map_*` (`T` maps to 0 or 1 `T`s).
- `move_map.rs`/`MoveMap`/`move_map`/`move_flat_map` are renamed
`map_in_place.rs`/`MapInPlace`/`map_in_place`/`flat_map_in_place` to
reflect their slightly changed signatures.
- Although this commit renames the `fold` module as `mut_visit`, it
keeps it in the `fold.rs` file, so as not to confuse git. The next
commit will rename the file.
2019-02-05 15:20:55 +11:00
|
|
|
_ => noop_filter_map_expr(expr, self),
|
2016-08-29 05:32:41 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Overhaul `syntax::fold::Folder`.
This commit changes `syntax::fold::Folder` from a functional style
(where most methods take a `T` and produce a new `T`) to a more
imperative style (where most methods take and modify a `&mut T`), and
renames it `syntax::mut_visit::MutVisitor`.
The first benefit is speed. The functional style does not require any
reallocations, due to the use of `P::map` and
`MoveMap::move_{,flat_}map`. However, every field in the AST must be
overwritten; even those fields that are unchanged are overwritten with
the same value. This causes a lot of unnecessary memory writes. The
imperative style reduces instruction counts by 1--3% across a wide range
of workloads, particularly incremental workloads.
The second benefit is conciseness; the imperative style is usually more
concise. E.g. compare the old functional style:
```
fn fold_abc(&mut self, abc: ABC) {
ABC {
a: fold_a(abc.a),
b: fold_b(abc.b),
c: abc.c,
}
}
```
with the imperative style:
```
fn visit_abc(&mut self, ABC { a, b, c: _ }: &mut ABC) {
visit_a(a);
visit_b(b);
}
```
(The reductions get larger in more complex examples.)
Overall, the patch removes over 200 lines of code -- even though the new
code has more comments -- and a lot of the remaining lines have fewer
characters.
Some notes:
- The old style used methods called `fold_*`. The new style mostly uses
methods called `visit_*`, but there are a few methods that map a `T`
to something other than a `T`, which are called `flat_map_*` (`T` maps
to multiple `T`s) or `filter_map_*` (`T` maps to 0 or 1 `T`s).
- `move_map.rs`/`MoveMap`/`move_map`/`move_flat_map` are renamed
`map_in_place.rs`/`MapInPlace`/`map_in_place`/`flat_map_in_place` to
reflect their slightly changed signatures.
- Although this commit renames the `fold` module as `mut_visit`, it
keeps it in the `fold.rs` file, so as not to confuse git. The next
commit will rename the file.
2019-02-05 15:20:55 +11:00
|
|
|
fn flat_map_stmt(&mut self, stmt: ast::Stmt) -> SmallVec<[ast::Stmt; 1]> {
|
2019-09-26 17:34:50 +01:00
|
|
|
let (style, mut stmts) = match stmt.kind {
|
2020-08-30 18:38:32 -04:00
|
|
|
ast::StmtKind::MacCall(mac) => (mac.style, self.remove(stmt.id).make_stmts()),
|
Overhaul `syntax::fold::Folder`.
This commit changes `syntax::fold::Folder` from a functional style
(where most methods take a `T` and produce a new `T`) to a more
imperative style (where most methods take and modify a `&mut T`), and
renames it `syntax::mut_visit::MutVisitor`.
The first benefit is speed. The functional style does not require any
reallocations, due to the use of `P::map` and
`MoveMap::move_{,flat_}map`. However, every field in the AST must be
overwritten; even those fields that are unchanged are overwritten with
the same value. This causes a lot of unnecessary memory writes. The
imperative style reduces instruction counts by 1--3% across a wide range
of workloads, particularly incremental workloads.
The second benefit is conciseness; the imperative style is usually more
concise. E.g. compare the old functional style:
```
fn fold_abc(&mut self, abc: ABC) {
ABC {
a: fold_a(abc.a),
b: fold_b(abc.b),
c: abc.c,
}
}
```
with the imperative style:
```
fn visit_abc(&mut self, ABC { a, b, c: _ }: &mut ABC) {
visit_a(a);
visit_b(b);
}
```
(The reductions get larger in more complex examples.)
Overall, the patch removes over 200 lines of code -- even though the new
code has more comments -- and a lot of the remaining lines have fewer
characters.
Some notes:
- The old style used methods called `fold_*`. The new style mostly uses
methods called `visit_*`, but there are a few methods that map a `T`
to something other than a `T`, which are called `flat_map_*` (`T` maps
to multiple `T`s) or `filter_map_*` (`T` maps to 0 or 1 `T`s).
- `move_map.rs`/`MoveMap`/`move_map`/`move_flat_map` are renamed
`map_in_place.rs`/`MapInPlace`/`map_in_place`/`flat_map_in_place` to
reflect their slightly changed signatures.
- Although this commit renames the `fold` module as `mut_visit`, it
keeps it in the `fold.rs` file, so as not to confuse git. The next
commit will rename the file.
2019-02-05 15:20:55 +11:00
|
|
|
_ => return noop_flat_map_stmt(stmt, self),
|
2016-08-29 05:32:41 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
if style == ast::MacStmtStyle::Semicolon {
|
2020-10-25 17:14:19 -04:00
|
|
|
// Implement the proposal described in
|
|
|
|
// https://github.com/rust-lang/rust/issues/61733#issuecomment-509626449
|
|
|
|
//
|
2020-11-07 23:25:10 +00:00
|
|
|
// The macro invocation expands to the list of statements. If the
|
|
|
|
// list of statements is empty, then 'parse' the trailing semicolon
|
|
|
|
// on the original invocation as an empty statement. That is:
|
2020-10-25 17:14:19 -04:00
|
|
|
//
|
|
|
|
// `empty();` is parsed as a single `StmtKind::Empty`
|
|
|
|
//
|
2020-11-07 23:25:10 +00:00
|
|
|
// If the list of statements is non-empty, see if the final
|
|
|
|
// statement already has a trailing semicolon.
|
2020-10-25 17:14:19 -04:00
|
|
|
//
|
2020-11-07 23:25:10 +00:00
|
|
|
// If it doesn't have a semicolon, then 'parse' the trailing
|
|
|
|
// semicolon from the invocation as part of the final statement,
|
2020-10-25 17:14:19 -04:00
|
|
|
// using `stmt.add_trailing_semicolon()`
|
|
|
|
//
|
|
|
|
// If it does have a semicolon, then 'parse' the trailing semicolon
|
|
|
|
// from the invocation as a new StmtKind::Empty
|
|
|
|
|
2020-11-07 23:25:10 +00:00
|
|
|
// FIXME: We will need to preserve the original semicolon token and
|
|
|
|
// span as part of #15701
|
2020-11-17 14:27:44 -05:00
|
|
|
let empty_stmt =
|
|
|
|
ast::Stmt { id: ast::DUMMY_NODE_ID, kind: ast::StmtKind::Empty, span: DUMMY_SP };
|
2020-10-25 17:14:19 -04:00
|
|
|
|
2018-06-20 02:08:08 +03:00
|
|
|
if let Some(stmt) = stmts.pop() {
|
2020-10-25 17:14:19 -04:00
|
|
|
if stmt.has_trailing_semicolon() {
|
|
|
|
stmts.push(stmt);
|
|
|
|
stmts.push(empty_stmt);
|
|
|
|
} else {
|
|
|
|
stmts.push(stmt.add_trailing_semicolon());
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
stmts.push(empty_stmt);
|
2016-08-29 05:32:41 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-06-20 02:08:08 +03:00
|
|
|
stmts
|
2016-08-29 05:32:41 +00:00
|
|
|
}
|
|
|
|
|
Overhaul `syntax::fold::Folder`.
This commit changes `syntax::fold::Folder` from a functional style
(where most methods take a `T` and produce a new `T`) to a more
imperative style (where most methods take and modify a `&mut T`), and
renames it `syntax::mut_visit::MutVisitor`.
The first benefit is speed. The functional style does not require any
reallocations, due to the use of `P::map` and
`MoveMap::move_{,flat_}map`. However, every field in the AST must be
overwritten; even those fields that are unchanged are overwritten with
the same value. This causes a lot of unnecessary memory writes. The
imperative style reduces instruction counts by 1--3% across a wide range
of workloads, particularly incremental workloads.
The second benefit is conciseness; the imperative style is usually more
concise. E.g. compare the old functional style:
```
fn fold_abc(&mut self, abc: ABC) {
ABC {
a: fold_a(abc.a),
b: fold_b(abc.b),
c: abc.c,
}
}
```
with the imperative style:
```
fn visit_abc(&mut self, ABC { a, b, c: _ }: &mut ABC) {
visit_a(a);
visit_b(b);
}
```
(The reductions get larger in more complex examples.)
Overall, the patch removes over 200 lines of code -- even though the new
code has more comments -- and a lot of the remaining lines have fewer
characters.
Some notes:
- The old style used methods called `fold_*`. The new style mostly uses
methods called `visit_*`, but there are a few methods that map a `T`
to something other than a `T`, which are called `flat_map_*` (`T` maps
to multiple `T`s) or `filter_map_*` (`T` maps to 0 or 1 `T`s).
- `move_map.rs`/`MoveMap`/`move_map`/`move_flat_map` are renamed
`map_in_place.rs`/`MapInPlace`/`map_in_place`/`flat_map_in_place` to
reflect their slightly changed signatures.
- Although this commit renames the `fold` module as `mut_visit`, it
keeps it in the `fold.rs` file, so as not to confuse git. The next
commit will rename the file.
2019-02-05 15:20:55 +11:00
|
|
|
fn visit_pat(&mut self, pat: &mut P<ast::Pat>) {
|
2019-09-26 16:18:31 +01:00
|
|
|
match pat.kind {
|
2020-02-29 19:32:20 +03:00
|
|
|
ast::PatKind::MacCall(_) => *pat = self.remove(pat.id).make_pat(),
|
Overhaul `syntax::fold::Folder`.
This commit changes `syntax::fold::Folder` from a functional style
(where most methods take a `T` and produce a new `T`) to a more
imperative style (where most methods take and modify a `&mut T`), and
renames it `syntax::mut_visit::MutVisitor`.
The first benefit is speed. The functional style does not require any
reallocations, due to the use of `P::map` and
`MoveMap::move_{,flat_}map`. However, every field in the AST must be
overwritten; even those fields that are unchanged are overwritten with
the same value. This causes a lot of unnecessary memory writes. The
imperative style reduces instruction counts by 1--3% across a wide range
of workloads, particularly incremental workloads.
The second benefit is conciseness; the imperative style is usually more
concise. E.g. compare the old functional style:
```
fn fold_abc(&mut self, abc: ABC) {
ABC {
a: fold_a(abc.a),
b: fold_b(abc.b),
c: abc.c,
}
}
```
with the imperative style:
```
fn visit_abc(&mut self, ABC { a, b, c: _ }: &mut ABC) {
visit_a(a);
visit_b(b);
}
```
(The reductions get larger in more complex examples.)
Overall, the patch removes over 200 lines of code -- even though the new
code has more comments -- and a lot of the remaining lines have fewer
characters.
Some notes:
- The old style used methods called `fold_*`. The new style mostly uses
methods called `visit_*`, but there are a few methods that map a `T`
to something other than a `T`, which are called `flat_map_*` (`T` maps
to multiple `T`s) or `filter_map_*` (`T` maps to 0 or 1 `T`s).
- `move_map.rs`/`MoveMap`/`move_map`/`move_flat_map` are renamed
`map_in_place.rs`/`MapInPlace`/`map_in_place`/`flat_map_in_place` to
reflect their slightly changed signatures.
- Although this commit renames the `fold` module as `mut_visit`, it
keeps it in the `fold.rs` file, so as not to confuse git. The next
commit will rename the file.
2019-02-05 15:20:55 +11:00
|
|
|
_ => noop_visit_pat(pat, self),
|
2016-08-29 05:32:41 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Overhaul `syntax::fold::Folder`.
This commit changes `syntax::fold::Folder` from a functional style
(where most methods take a `T` and produce a new `T`) to a more
imperative style (where most methods take and modify a `&mut T`), and
renames it `syntax::mut_visit::MutVisitor`.
The first benefit is speed. The functional style does not require any
reallocations, due to the use of `P::map` and
`MoveMap::move_{,flat_}map`. However, every field in the AST must be
overwritten; even those fields that are unchanged are overwritten with
the same value. This causes a lot of unnecessary memory writes. The
imperative style reduces instruction counts by 1--3% across a wide range
of workloads, particularly incremental workloads.
The second benefit is conciseness; the imperative style is usually more
concise. E.g. compare the old functional style:
```
fn fold_abc(&mut self, abc: ABC) {
ABC {
a: fold_a(abc.a),
b: fold_b(abc.b),
c: abc.c,
}
}
```
with the imperative style:
```
fn visit_abc(&mut self, ABC { a, b, c: _ }: &mut ABC) {
visit_a(a);
visit_b(b);
}
```
(The reductions get larger in more complex examples.)
Overall, the patch removes over 200 lines of code -- even though the new
code has more comments -- and a lot of the remaining lines have fewer
characters.
Some notes:
- The old style used methods called `fold_*`. The new style mostly uses
methods called `visit_*`, but there are a few methods that map a `T`
to something other than a `T`, which are called `flat_map_*` (`T` maps
to multiple `T`s) or `filter_map_*` (`T` maps to 0 or 1 `T`s).
- `move_map.rs`/`MoveMap`/`move_map`/`move_flat_map` are renamed
`map_in_place.rs`/`MapInPlace`/`map_in_place`/`flat_map_in_place` to
reflect their slightly changed signatures.
- Although this commit renames the `fold` module as `mut_visit`, it
keeps it in the `fold.rs` file, so as not to confuse git. The next
commit will rename the file.
2019-02-05 15:20:55 +11:00
|
|
|
fn visit_ty(&mut self, ty: &mut P<ast::Ty>) {
|
2019-09-26 17:25:31 +01:00
|
|
|
match ty.kind {
|
2020-02-29 19:32:20 +03:00
|
|
|
ast::TyKind::MacCall(_) => *ty = self.remove(ty.id).make_ty(),
|
Overhaul `syntax::fold::Folder`.
This commit changes `syntax::fold::Folder` from a functional style
(where most methods take a `T` and produce a new `T`) to a more
imperative style (where most methods take and modify a `&mut T`), and
renames it `syntax::mut_visit::MutVisitor`.
The first benefit is speed. The functional style does not require any
reallocations, due to the use of `P::map` and
`MoveMap::move_{,flat_}map`. However, every field in the AST must be
overwritten; even those fields that are unchanged are overwritten with
the same value. This causes a lot of unnecessary memory writes. The
imperative style reduces instruction counts by 1--3% across a wide range
of workloads, particularly incremental workloads.
The second benefit is conciseness; the imperative style is usually more
concise. E.g. compare the old functional style:
```
fn fold_abc(&mut self, abc: ABC) {
ABC {
a: fold_a(abc.a),
b: fold_b(abc.b),
c: abc.c,
}
}
```
with the imperative style:
```
fn visit_abc(&mut self, ABC { a, b, c: _ }: &mut ABC) {
visit_a(a);
visit_b(b);
}
```
(The reductions get larger in more complex examples.)
Overall, the patch removes over 200 lines of code -- even though the new
code has more comments -- and a lot of the remaining lines have fewer
characters.
Some notes:
- The old style used methods called `fold_*`. The new style mostly uses
methods called `visit_*`, but there are a few methods that map a `T`
to something other than a `T`, which are called `flat_map_*` (`T` maps
to multiple `T`s) or `filter_map_*` (`T` maps to 0 or 1 `T`s).
- `move_map.rs`/`MoveMap`/`move_map`/`move_flat_map` are renamed
`map_in_place.rs`/`MapInPlace`/`map_in_place`/`flat_map_in_place` to
reflect their slightly changed signatures.
- Although this commit renames the `fold` module as `mut_visit`, it
keeps it in the `fold.rs` file, so as not to confuse git. The next
commit will rename the file.
2019-02-05 15:20:55 +11:00
|
|
|
_ => noop_visit_ty(ty, self),
|
2016-08-29 05:32:41 +00:00
|
|
|
}
|
|
|
|
}
|
2016-09-05 00:10:27 +00:00
|
|
|
|
Overhaul `syntax::fold::Folder`.
This commit changes `syntax::fold::Folder` from a functional style
(where most methods take a `T` and produce a new `T`) to a more
imperative style (where most methods take and modify a `&mut T`), and
renames it `syntax::mut_visit::MutVisitor`.
The first benefit is speed. The functional style does not require any
reallocations, due to the use of `P::map` and
`MoveMap::move_{,flat_}map`. However, every field in the AST must be
overwritten; even those fields that are unchanged are overwritten with
the same value. This causes a lot of unnecessary memory writes. The
imperative style reduces instruction counts by 1--3% across a wide range
of workloads, particularly incremental workloads.
The second benefit is conciseness; the imperative style is usually more
concise. E.g. compare the old functional style:
```
fn fold_abc(&mut self, abc: ABC) {
ABC {
a: fold_a(abc.a),
b: fold_b(abc.b),
c: abc.c,
}
}
```
with the imperative style:
```
fn visit_abc(&mut self, ABC { a, b, c: _ }: &mut ABC) {
visit_a(a);
visit_b(b);
}
```
(The reductions get larger in more complex examples.)
Overall, the patch removes over 200 lines of code -- even though the new
code has more comments -- and a lot of the remaining lines have fewer
characters.
Some notes:
- The old style used methods called `fold_*`. The new style mostly uses
methods called `visit_*`, but there are a few methods that map a `T`
to something other than a `T`, which are called `flat_map_*` (`T` maps
to multiple `T`s) or `filter_map_*` (`T` maps to 0 or 1 `T`s).
- `move_map.rs`/`MoveMap`/`move_map`/`move_flat_map` are renamed
`map_in_place.rs`/`MapInPlace`/`map_in_place`/`flat_map_in_place` to
reflect their slightly changed signatures.
- Although this commit renames the `fold` module as `mut_visit`, it
keeps it in the `fold.rs` file, so as not to confuse git. The next
commit will rename the file.
2019-02-05 15:20:55 +11:00
|
|
|
fn visit_block(&mut self, block: &mut P<ast::Block>) {
|
|
|
|
noop_visit_block(block, self);
|
2016-09-05 00:10:27 +00:00
|
|
|
|
Overhaul `syntax::fold::Folder`.
This commit changes `syntax::fold::Folder` from a functional style
(where most methods take a `T` and produce a new `T`) to a more
imperative style (where most methods take and modify a `&mut T`), and
renames it `syntax::mut_visit::MutVisitor`.
The first benefit is speed. The functional style does not require any
reallocations, due to the use of `P::map` and
`MoveMap::move_{,flat_}map`. However, every field in the AST must be
overwritten; even those fields that are unchanged are overwritten with
the same value. This causes a lot of unnecessary memory writes. The
imperative style reduces instruction counts by 1--3% across a wide range
of workloads, particularly incremental workloads.
The second benefit is conciseness; the imperative style is usually more
concise. E.g. compare the old functional style:
```
fn fold_abc(&mut self, abc: ABC) {
ABC {
a: fold_a(abc.a),
b: fold_b(abc.b),
c: abc.c,
}
}
```
with the imperative style:
```
fn visit_abc(&mut self, ABC { a, b, c: _ }: &mut ABC) {
visit_a(a);
visit_b(b);
}
```
(The reductions get larger in more complex examples.)
Overall, the patch removes over 200 lines of code -- even though the new
code has more comments -- and a lot of the remaining lines have fewer
characters.
Some notes:
- The old style used methods called `fold_*`. The new style mostly uses
methods called `visit_*`, but there are a few methods that map a `T`
to something other than a `T`, which are called `flat_map_*` (`T` maps
to multiple `T`s) or `filter_map_*` (`T` maps to 0 or 1 `T`s).
- `move_map.rs`/`MoveMap`/`move_map`/`move_flat_map` are renamed
`map_in_place.rs`/`MapInPlace`/`map_in_place`/`flat_map_in_place` to
reflect their slightly changed signatures.
- Although this commit renames the `fold` module as `mut_visit`, it
keeps it in the `fold.rs` file, so as not to confuse git. The next
commit will rename the file.
2019-02-05 15:20:55 +11:00
|
|
|
for stmt in block.stmts.iter_mut() {
|
2019-05-29 04:10:49 +03:00
|
|
|
if self.monotonic {
|
|
|
|
assert_eq!(stmt.id, ast::DUMMY_NODE_ID);
|
|
|
|
stmt.id = self.cx.resolver.next_node_id();
|
Overhaul `syntax::fold::Folder`.
This commit changes `syntax::fold::Folder` from a functional style
(where most methods take a `T` and produce a new `T`) to a more
imperative style (where most methods take and modify a `&mut T`), and
renames it `syntax::mut_visit::MutVisitor`.
The first benefit is speed. The functional style does not require any
reallocations, due to the use of `P::map` and
`MoveMap::move_{,flat_}map`. However, every field in the AST must be
overwritten; even those fields that are unchanged are overwritten with
the same value. This causes a lot of unnecessary memory writes. The
imperative style reduces instruction counts by 1--3% across a wide range
of workloads, particularly incremental workloads.
The second benefit is conciseness; the imperative style is usually more
concise. E.g. compare the old functional style:
```
fn fold_abc(&mut self, abc: ABC) {
ABC {
a: fold_a(abc.a),
b: fold_b(abc.b),
c: abc.c,
}
}
```
with the imperative style:
```
fn visit_abc(&mut self, ABC { a, b, c: _ }: &mut ABC) {
visit_a(a);
visit_b(b);
}
```
(The reductions get larger in more complex examples.)
Overall, the patch removes over 200 lines of code -- even though the new
code has more comments -- and a lot of the remaining lines have fewer
characters.
Some notes:
- The old style used methods called `fold_*`. The new style mostly uses
methods called `visit_*`, but there are a few methods that map a `T`
to something other than a `T`, which are called `flat_map_*` (`T` maps
to multiple `T`s) or `filter_map_*` (`T` maps to 0 or 1 `T`s).
- `move_map.rs`/`MoveMap`/`move_map`/`move_flat_map` are renamed
`map_in_place.rs`/`MapInPlace`/`map_in_place`/`flat_map_in_place` to
reflect their slightly changed signatures.
- Although this commit renames the `fold` module as `mut_visit`, it
keeps it in the `fold.rs` file, so as not to confuse git. The next
commit will rename the file.
2019-02-05 15:20:55 +11:00
|
|
|
}
|
|
|
|
}
|
2016-09-05 00:10:27 +00:00
|
|
|
}
|
2016-08-29 05:32:41 +00:00
|
|
|
}
|