bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Remove ScopeDepth entirely.

Browse source 
The scope depth was tracked, but never actually used for anything.
This commit is contained in:
Mara Bos 2025-03-28 08:15:18 +01:00
parent 3f690c2257
commit 3a9a5770ef
3 changed files with 18 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

8
compiler/rustc_middle/src/middle/region.rs
View file

@ -199,8 +199,6 @@ impl Scope {
}
}
pub type ScopeDepth = u32;
/// The region scope tree encodes information about region relationships.
#[derive(Default, Debug, HashStable)]
pub struct ScopeTree {
@ -213,7 +211,7 @@ pub struct ScopeTree {
/// conditional expression or repeating block. (Note that the
/// enclosing scope ID for the block associated with a closure is
/// the closure itself.)
pub parent_map: FxIndexMap<Scope, (Scope, ScopeDepth)>,
pub parent_map: FxIndexMap<Scope, Scope>,
/// Maps from a variable or binding ID to the block in which that
/// variable is declared.
@ -328,7 +326,7 @@ pub struct YieldData {
}
impl ScopeTree {
pub fn record_scope_parent(&mut self, child: Scope, parent: Option<(Scope, ScopeDepth)>) {
pub fn record_scope_parent(&mut self, child: Scope, parent: Option<Scope>) {
debug!("{:?}.parent = {:?}", child, parent);
if let Some(p) = parent {
@ -353,7 +351,7 @@ impl ScopeTree {
/// Returns the narrowest scope that encloses `id`, if any.
pub fn opt_encl_scope(&self, id: Scope) -> Option<Scope> {
self.parent_map.get(&id).cloned().map(|(p, _)| p)
self.parent_map.get(&id).cloned()
}
/// Returns the lifetime of the local variable `var_id`, if any.

2
compiler/rustc_middle/src/ty/rvalue_scopes.rs
View file

@ -38,7 +38,7 @@ impl RvalueScopes {
let mut id = Scope { local_id: expr_id, data: ScopeData::Node };
let mut backwards_incompatible = None;
while let Some(&(p, _)) = region_scope_tree.parent_map.get(&id) {
while let Some(&p) = region_scope_tree.parent_map.get(&id) {
match p.data {
ScopeData::Destruction => {
debug!("temporary_scope({expr_id:?}) = {id:?} [enclosing]");