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

Use RPITIT for Successors and Predecessors traits

Browse source 
Now with RPITIT instead of GAT!
This commit is contained in:
Maybe Waffle 2024-04-15 13:33:08 +00:00
parent e8d2221e3b
commit 435db9b9bd
8 changed files with 14 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

12
compiler/rustc_data_structures/src/graph/mod.rs
View file

@ -25,19 +25,11 @@ pub trait StartNode: DirectedGraph {
}
pub trait Successors: DirectedGraph {
type Successors<'g>: Iterator<Item = Self::Node>
where
Self: 'g;
fn successors(&self, node: Self::Node) -> Self::Successors<'_>;
fn successors(&self, node: Self::Node) -> impl Iterator<Item = Self::Node>;
}
pub trait Predecessors: DirectedGraph {
type Predecessors<'g>: Iterator<Item = Self::Node>
where
Self: 'g;
fn predecessors(&self, node: Self::Node) -> Self::Predecessors<'_>;
fn predecessors(&self, node: Self::Node) -> impl Iterator<Item = Self::Node>;
}
/// Alias for [`DirectedGraph`] + [`StartNode`] + [`Predecessors`] + [`Successors`].

8
compiler/rustc_data_structures/src/graph/reference.rs
View file

@ -15,17 +15,13 @@ impl<'graph, G: StartNode> StartNode for &'graph G {
}
impl<'graph, G: Successors> Successors for &'graph G {
type Successors<'g> = G::Successors<'g> where 'graph: 'g;
fn successors(&self, node: Self::Node) -> Self::Successors<'_> {
fn successors(&self, node: Self::Node) -> impl Iterator<Item = Self::Node> {
(**self).successors(node)
}
}
impl<'graph, G: Predecessors> Predecessors for &'graph G {
type Predecessors<'g> = G::Predecessors<'g> where 'graph: 'g;
fn predecessors(&self, node: Self::Node) -> Self::Predecessors<'_> {
fn predecessors(&self, node: Self::Node) -> impl Iterator<Item = Self::Node> {
(**self).predecessors(node)
}
}

4
compiler/rustc_data_structures/src/graph/scc/mod.rs
View file

@ -104,9 +104,7 @@ impl<N: Idx, S: Idx + Ord> NumEdges for Sccs<N, S> {
}
impl<N: Idx, S: Idx + Ord> Successors for Sccs<N, S> {
type Successors<'g> = std::iter::Cloned<std::slice::Iter<'g, S>>;
fn successors(&self, node: S) -> Self::Successors<'_> {
fn successors(&self, node: S) -> impl Iterator<Item = Self::Node> {
self.successors(node).iter().cloned()
}
}

10
compiler/rustc_data_structures/src/graph/tests.rs
View file

@ -1,7 +1,5 @@
use crate::fx::FxHashMap;
use std::cmp::max;
use std::iter;
use std::slice;
use super::*;
@ -49,17 +47,13 @@ impl StartNode for TestGraph {
}
impl Predecessors for TestGraph {
type Predecessors<'g> = iter::Cloned<slice::Iter<'g, usize>>;
fn predecessors(&self, node: usize) -> Self::Predecessors<'_> {
fn predecessors(&self, node: usize) -> impl Iterator<Item = Self::Node> {
self.predecessors[&node].iter().cloned()
}
}
impl Successors for TestGraph {
type Successors<'g> = iter::Cloned<slice::Iter<'g, usize>>;
fn successors(&self, node: usize) -> Self::Successors<'_> {
fn successors(&self, node: usize) -> impl Iterator<Item = Self::Node> {
self.successors[&node].iter().cloned()
}
}

4
compiler/rustc_data_structures/src/graph/vec_graph/mod.rs
View file

@ -93,9 +93,7 @@ impl<N: Idx> NumEdges for VecGraph<N> {
}
impl<N: Idx + Ord> Successors for VecGraph<N> {
type Successors<'g> = std::iter::Cloned<std::slice::Iter<'g, N>>;
fn successors(&self, node: N) -> Self::Successors<'_> {
fn successors(&self, node: N) -> impl Iterator<Item = Self::Node> {
self.successors(node).iter().cloned()
}
}