diff options
| author | kennytm <kennytm@gmail.com> | 2019-02-20 01:13:24 +0800 |
|---|---|---|
| committer | kennytm <kennytm@gmail.com> | 2019-02-20 11:58:38 +0800 |
| commit | e95297ca15d00363cafe2f56159898b7fa2e9e21 (patch) | |
| tree | cbe6a3373caba5144f5b548186f7a8f16685e11d | |
| parent | 897778ec2881f17f9106477c1d47646c86c60bc7 (diff) | |
| parent | cdd1c0efbb37fd475ebc60e0e58e32e7d2cbff19 (diff) | |
| download | rust-e95297ca15d00363cafe2f56159898b7fa2e9e21.tar.gz rust-e95297ca15d00363cafe2f56159898b7fa2e9e21.zip | |
Rollup merge of #58528 - Zoxc:stmtkind-item, r=oli-obk
Don't use an allocation for ItemId in StmtKind
| -rw-r--r-- | src/librustc/hir/intravisit.rs | 2 | ||||
| -rw-r--r-- | src/librustc/hir/lowering.rs | 4 | ||||
| -rw-r--r-- | src/librustc/hir/mod.rs | 3 | ||||
| -rw-r--r-- | src/librustc/hir/print.rs | 4 |
4 files changed, 7 insertions, 6 deletions
diff --git a/src/librustc/hir/intravisit.rs b/src/librustc/hir/intravisit.rs index 94b036fded5..4a2bc213fea 100644 --- a/src/librustc/hir/intravisit.rs +++ b/src/librustc/hir/intravisit.rs @@ -953,7 +953,7 @@ pub fn walk_stmt<'v, V: Visitor<'v>>(visitor: &mut V, statement: &'v Stmt) { visitor.visit_id(statement.id); match statement.node { StmtKind::Local(ref local) => visitor.visit_local(local), - StmtKind::Item(ref item) => visitor.visit_nested_item(**item), + StmtKind::Item(item) => visitor.visit_nested_item(item), StmtKind::Expr(ref expression) | StmtKind::Semi(ref expression) => { visitor.visit_expr(expression) diff --git a/src/librustc/hir/lowering.rs b/src/librustc/hir/lowering.rs index 52c3eb26d61..9f48a628274 100644 --- a/src/librustc/hir/lowering.rs +++ b/src/librustc/hir/lowering.rs @@ -4656,7 +4656,7 @@ impl<'a> LoweringContext<'a> { hir::Stmt { id: node_id, hir_id, - node: hir::StmtKind::Item(P(item_id)), + node: hir::StmtKind::Item(item_id), span: s.span, } }) @@ -4686,7 +4686,7 @@ impl<'a> LoweringContext<'a> { hir::Stmt { id: node_id, hir_id, - node: hir::StmtKind::Item(P(item_id)), + node: hir::StmtKind::Item(item_id), span: s.span, } }) diff --git a/src/librustc/hir/mod.rs b/src/librustc/hir/mod.rs index d7d56ef659a..deb2eb33b0f 100644 --- a/src/librustc/hir/mod.rs +++ b/src/librustc/hir/mod.rs @@ -1175,8 +1175,9 @@ impl fmt::Debug for Stmt { pub enum StmtKind { /// A local (`let`) binding. Local(P<Local>), + /// An item binding. - Item(P<ItemId>), + Item(ItemId), /// An expression without a trailing semi-colon (must have unit type). Expr(P<Expr>), diff --git a/src/librustc/hir/print.rs b/src/librustc/hir/print.rs index 031b3a3233d..ece649cf1b8 100644 --- a/src/librustc/hir/print.rs +++ b/src/librustc/hir/print.rs @@ -1007,8 +1007,8 @@ impl<'a> State<'a> { } self.end()? } - hir::StmtKind::Item(ref item) => { - self.ann.nested(self, Nested::Item(**item))? + hir::StmtKind::Item(item) => { + self.ann.nested(self, Nested::Item(item))? } hir::StmtKind::Expr(ref expr) => { self.space_if_not_bol()?; |