bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Replace Vec by Option.

Browse source
This commit is contained in:
Camille GILLOT 2021-04-01 19:42:27 +02:00
parent 1baac86670
commit fed4410def
2 changed files with 14 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

32
compiler/rustc_ast_lowering/src/expr.rs
View file

@ -1186,9 +1186,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
} }
} }
None => self None => self
.loop_scopes .loop_scope
.last()
.cloned()
.map(|id| Ok(self.lower_node_id(id))) .map(|id| Ok(self.lower_node_id(id)))
.unwrap_or(Err(hir::LoopIdError::OutsideLoopScope)), .unwrap_or(Err(hir::LoopIdError::OutsideLoopScope)),
}; };
@ -1208,18 +1206,9 @@ impl<'hir> LoweringContext<'_, 'hir> {
} }
fn with_catch_scope<T>(&mut self, catch_id: NodeId, f: impl FnOnce(&mut Self) -> T) -> T { fn with_catch_scope<T>(&mut self, catch_id: NodeId, f: impl FnOnce(&mut Self) -> T) -> T {
let len = self.catch_scopes.len(); let old_scope = self.catch_scope.replace(catch_id);
self.catch_scopes.push(catch_id);
let result = f(self); let result = f(self);
assert_eq!( self.catch_scope = old_scope;
len + 1,
self.catch_scopes.len(),
"catch scopes should be added and removed in stack order"
);
self.catch_scopes.pop().unwrap();
result result
} }
@ -1228,17 +1217,9 @@ impl<'hir> LoweringContext<'_, 'hir> {
let was_in_loop_condition = self.is_in_loop_condition; let was_in_loop_condition = self.is_in_loop_condition;
self.is_in_loop_condition = false; self.is_in_loop_condition = false;
let len = self.loop_scopes.len(); let old_scope = self.loop_scope.replace(loop_id);
self.loop_scopes.push(loop_id);
let result = f(self); let result = f(self);
assert_eq!( self.loop_scope = old_scope;
len + 1,
self.loop_scopes.len(),
"loop scopes should be added and removed in stack order"
);
self.loop_scopes.pop().unwrap();
self.is_in_loop_condition = was_in_loop_condition; self.is_in_loop_condition = was_in_loop_condition;
@ -1565,8 +1546,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
unstable_span, unstable_span,
); );
let thin_attrs = ThinVec::from(attrs); let thin_attrs = ThinVec::from(attrs);
let catch_scope = self.catch_scopes.last().copied(); let ret_expr = if let Some(catch_node) = self.catch_scope {
let ret_expr = if let Some(catch_node) = catch_scope {
let target_id = Ok(self.lower_node_id(catch_node)); let target_id = Ok(self.lower_node_id(catch_node));
self.arena.alloc(self.expr( self.arena.alloc(self.expr(
try_span, try_span,

17
compiler/rustc_ast_lowering/src/lib.rs
View file

@ -64,7 +64,6 @@ use rustc_span::{Span, DUMMY_SP};
use smallvec::SmallVec; use smallvec::SmallVec;
use std::collections::BTreeMap; use std::collections::BTreeMap;
use std::mem;
use tracing::{debug, trace}; use tracing::{debug, trace};
macro_rules! arena_vec { macro_rules! arena_vec {
@ -117,8 +116,8 @@ struct LoweringContext<'a, 'hir: 'a> {
/// outside of an `async fn`. /// outside of an `async fn`.
current_item: Option<Span>, current_item: Option<Span>,
catch_scopes: Vec<NodeId>, catch_scope: Option<NodeId>,
loop_scopes: Vec<NodeId>, loop_scope: Option<NodeId>,
is_in_loop_condition: bool, is_in_loop_condition: bool,
is_in_trait_impl: bool, is_in_trait_impl: bool,
is_in_dyn_type: bool, is_in_dyn_type: bool,
@ -323,8 +322,8 @@ pub fn lower_crate<'a, 'hir>(
bodies: BTreeMap::new(), bodies: BTreeMap::new(),
modules: BTreeMap::new(), modules: BTreeMap::new(),
attrs: BTreeMap::default(), attrs: BTreeMap::default(),
catch_scopes: Vec::new(), catch_scope: None,
loop_scopes: Vec::new(), loop_scope: None,
is_in_loop_condition: false, is_in_loop_condition: false,
is_in_trait_impl: false, is_in_trait_impl: false,
is_in_dyn_type: false, is_in_dyn_type: false,
@ -911,11 +910,11 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
let was_in_loop_condition = self.is_in_loop_condition; let was_in_loop_condition = self.is_in_loop_condition;
self.is_in_loop_condition = false; self.is_in_loop_condition = false;
let catch_scopes = mem::take(&mut self.catch_scopes); let catch_scope = self.catch_scope.take();
let loop_scopes = mem::take(&mut self.loop_scopes); let loop_scope = self.loop_scope.take();
let ret = f(self); let ret = f(self);
self.catch_scopes = catch_scopes; self.catch_scope = catch_scope;
self.loop_scopes = loop_scopes; self.loop_scope = loop_scope;
self.is_in_loop_condition = was_in_loop_condition; self.is_in_loop_condition = was_in_loop_condition;