From fb100e5ddcb09e5738231a49a1e709a157bdc027 Mon Sep 17 00:00:00 2001 From: Camille GILLOT Date: Tue, 24 Dec 2019 18:57:28 +0100 Subject: [PATCH] Move arena_vec inside lowering. --- src/librustc/hir/lowering.rs | 15 ++++++++++++--- src/librustc/hir/mod.rs | 9 --------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/librustc/hir/lowering.rs b/src/librustc/hir/lowering.rs index 432d550a2403..ed84bd118f72 100644 --- a/src/librustc/hir/lowering.rs +++ b/src/librustc/hir/lowering.rs @@ -32,9 +32,6 @@ //! get confused if the spans from leaf AST nodes occur in multiple places //! in the HIR, especially for multiple identifiers. -mod expr; -mod item; - use crate::arena::Arena; use crate::dep_graph::DepGraph; use crate::hir::def::{DefKind, Namespace, PartialRes, PerNS, Res}; @@ -76,6 +73,18 @@ use syntax_pos::Span; use rustc_error_codes::*; +macro_rules! arena_vec { + () => ( + &[] + ); + ($this:expr; $($x:expr),*) => ( + $this.arena.alloc_from_iter(vec![$($x),*]) + ); +} + +mod expr; +mod item; + const HIR_ID_COUNTER_LOCKED: u32 = 0xFFFFFFFF; pub struct LoweringContext<'a, 'hir: 'a> { diff --git a/src/librustc/hir/mod.rs b/src/librustc/hir/mod.rs index 003917ee1e1b..8a450cf167a3 100644 --- a/src/librustc/hir/mod.rs +++ b/src/librustc/hir/mod.rs @@ -50,15 +50,6 @@ macro_rules! hir_vec { ); } -macro_rules! arena_vec { - () => ( - &[] - ); - ($this:expr; $($x:expr),*) => ( - $this.arena.alloc_from_iter(vec![$($x),*]) - ); -} - pub mod check_attr; pub mod def; pub mod def_id;