diff options
| author | John Kåre Alsaker <john.kare.alsaker@gmail.com> | 2019-02-17 07:23:13 +0100 |
|---|---|---|
| committer | John Kåre Alsaker <john.kare.alsaker@gmail.com> | 2019-02-17 07:23:13 +0100 |
| commit | cdd1c0efbb37fd475ebc60e0e58e32e7d2cbff19 (patch) | |
| tree | e51697a05cd6326ca93cb6c0dfa30c85c7aa2092 /src | |
| parent | eac09088e1a8fc8a293028764e4e84da29469205 (diff) | |
| download | rust-cdd1c0efbb37fd475ebc60e0e58e32e7d2cbff19.tar.gz rust-cdd1c0efbb37fd475ebc60e0e58e32e7d2cbff19.zip | |
Don't use an allocation for ItemId in StmtKind
Diffstat (limited to 'src')
| -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 9436c600c9f..a8fa1f31a55 100644 --- a/src/librustc/hir/intravisit.rs +++ b/src/librustc/hir/intravisit.rs @@ -951,7 +951,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 84487c40f87..2341dda6768 100644 --- a/src/librustc/hir/lowering.rs +++ b/src/librustc/hir/lowering.rs @@ -4663,7 +4663,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, } }) @@ -4693,7 +4693,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 d774359fa79..f4a9903e559 100644 --- a/src/librustc/hir/mod.rs +++ b/src/librustc/hir/mod.rs @@ -1159,8 +1159,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 9b6fcf259be..81a67b1a4bc 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()?; |