diff --git a/compiler/rustc_borrowck/src/constraints/mod.rs b/compiler/rustc_borrowck/src/constraints/mod.rs index ecb05eb09a4..111a62aa6af 100644 --- a/compiler/rustc_borrowck/src/constraints/mod.rs +++ b/compiler/rustc_borrowck/src/constraints/mod.rs @@ -62,7 +62,8 @@ fn merge_reached(mut self, other: Self) -> Self { impl RegionTracker { pub fn new(rvid: RegionVid, definition: &RegionDefinition<'_>) -> Self { - let (representative_is_placeholder, representative_is_existential) = match definition.origin { + let (representative_is_placeholder, representative_is_existential) = match definition.origin + { rustc_infer::infer::NllRegionVariableOrigin::FreeRegion => (false, false), rustc_infer::infer::NllRegionVariableOrigin::Placeholder(_) => (true, false), rustc_infer::infer::NllRegionVariableOrigin::Existential { .. } => (false, true), @@ -71,7 +72,6 @@ pub fn new(rvid: RegionVid, definition: &RegionDefinition<'_>) -> Self { let placeholder_universe = if representative_is_placeholder { definition.universe } else { UniverseIndex::ROOT }; - Self { max_placeholder_universe_reached: placeholder_universe, min_reachable_universe: definition.universe, diff --git a/compiler/rustc_data_structures/src/graph/scc/mod.rs b/compiler/rustc_data_structures/src/graph/scc/mod.rs index 1426aa2baa4..e7ec2f97505 100644 --- a/compiler/rustc_data_structures/src/graph/scc/mod.rs +++ b/compiler/rustc_data_structures/src/graph/scc/mod.rs @@ -396,7 +396,9 @@ fn find_state(&mut self, mut node: G::Node) -> NodeState { loop { debug!("find_state(r = {node:?} in state {:?})", self.node_states[node]); match self.node_states[node] { - s @ (NodeState::NotVisited | NodeState::BeingVisited{..} | NodeState::InCycle { .. }) => break s, + s @ (NodeState::NotVisited + | NodeState::BeingVisited { .. } + | NodeState::InCycle { .. }) => break s, NodeState::InCycleWith { parent } => { // We test this, to be extremely sure that we never // ever break our termination condition for the @@ -409,7 +411,6 @@ fn find_state(&mut self, mut node: G::Node) -> NodeState { previous_node = node; node = parent; } - } } };