diff options
| author | Amanda Stjerna <amanda.stjerna@it.uu.se> | 2024-05-17 15:12:31 +0200 |
|---|---|---|
| committer | Amanda Stjerna <amanda.stjerna@it.uu.se> | 2024-06-12 15:47:32 +0200 |
| commit | 582c613be80f7b308972290773b23cac39c4b7d7 (patch) | |
| tree | 4a8b07f54a63d6f8b21e9c83101ec76653043168 /compiler | |
| parent | 905db03b2869d6c53893ccddd84d8b2fd3c48273 (diff) | |
| download | rust-582c613be80f7b308972290773b23cac39c4b7d7.tar.gz rust-582c613be80f7b308972290773b23cac39c4b7d7.zip | |
Formatting, weird because I just did that
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/rustc_borrowck/src/constraints/mod.rs | 4 | ||||
| -rw-r--r-- | compiler/rustc_data_structures/src/graph/scc/mod.rs | 5 |
2 files changed, 5 insertions, 4 deletions
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 @@ impl scc::Annotation for RegionTracker { 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 @@ impl RegionTracker { 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 @@ where 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 @@ where previous_node = node; node = parent; } - } } }; |
