mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Formatting, weird because I just did that

Browse Source
This commit is contained in:
Amanda Stjerna 2024-05-17 15:12:31 +02:00
parent 905db03b28
commit 582c613be8
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compiler/rustc_borrowck/src/constraints/mod.rs
View File

@ -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,

5
compiler/rustc_data_structures/src/graph/scc/mod.rs
View File

@ -396,7 +396,9 @@ fn find_state(&mut self, mut node: G::Node) -> NodeState<G::Node, S, A> {
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<G::Node, S, A> {
previous_node = node;
node = parent;
}
}
}
};