replace Output type parameters with FactTypes

rust-lang · Sep 23, 2019 · 0a98cca · 0a98cca
1 parent 08fe124
commit 0a98cca
Showing 1 changed file with 11 additions and 24 deletions.
diff --git a/polonius-engine/src/output/mod.rs b/polonius-engine/src/output/mod.rs
@@ -18,7 +18,7 @@ mod initialization;
 mod liveness;
 mod location_insensitive;
 mod naive;
-use facts::{AllFacts, Atom};
+use facts::{AllFacts, Atom, FactTypes};
 
 #[derive(Debug, Clone, Copy)]
 pub enum Algorithm {
@@ -62,21 +62,14 @@ impl ::std::str::FromStr for Algorithm {
 }
 
 #[derive(Clone, Debug)]
-pub struct Output<Region, Loan, Point, Variable, MovePath>
-where
-    Region: Atom,
-    Region: Atom,
-    Loan: Atom,
-    Point: Atom,
-    Variable: Atom,
-    MovePath: Atom,
+pub struct Output<T: FactTypes>
 {
-    pub errors: FxHashMap<Point, Vec<Loan>>,
+    pub errors: FxHashMap<T::Point, Vec<T::Loan>>,
 
     pub dump_enabled: bool,
 
     // these are just for debugging
-    pub borrow_live_at: FxHashMap<Point, Vec<Loan>>,
+    pub borrow_live_at: FxHashMap<T::Point, Vec<T::Loan>>,
     pub restricts: FxHashMap<Point, BTreeMap<Region, BTreeSet<Loan>>>,
     pub restricts_anywhere: FxHashMap<Region, BTreeSet<Loan>>,
     pub region_live_at: FxHashMap<Point, Vec<Region>>,
@@ -125,16 +118,10 @@ fn compare_errors<Loan: Atom, Point: Atom>(
     differ
 }
 
-impl<Region, Loan, Point, Variable, MovePath> Output<Region, Loan, Point, Variable, MovePath>
-where
-    Region: Atom,
-    Loan: Atom,
-    Point: Atom,
-    Variable: Atom,
-    MovePath: Atom,
+impl<T: FactTypes> Output<T>
 {
     pub fn compute(
-        all_facts: &AllFacts<Region, Loan, Point, Variable, MovePath>,
+        all_facts: &AllFacts<T>,
         algorithm: Algorithm,
         dump_enabled: bool,
     ) -> Self {
@@ -180,37 +167,37 @@ where
         }
     }
 
-    pub fn errors_at(&self, location: Point) -> &[Loan] {
+    pub fn errors_at(&self, location: T::Point) -> &[T::Loan] {
         match self.errors.get(&location) {
             Some(v) => v,
             None => &[],
         }
     }
 
-    pub fn borrows_in_scope_at(&self, location: Point) -> &[Loan] {
+    pub fn borrows_in_scope_at(&self, location: T::Point) -> &[T::Loan] {
         match self.borrow_live_at.get(&location) {
             Some(p) => p,
             None => &[],
         }
     }
 
-    pub fn restricts_at(&self, location: Point) -> Cow<'_, BTreeMap<Region, BTreeSet<Loan>>> {
+    pub fn restricts_at(&self, location: T::Point) -> Cow<'_, BTreeMap<T::Region, BTreeSet<T::Loan>>> {
         assert!(self.dump_enabled);
         match self.restricts.get(&location) {
             Some(map) => Cow::Borrowed(map),
             None => Cow::Owned(BTreeMap::default()),
         }
     }
 
-    pub fn regions_live_at(&self, location: Point) -> &[Region] {
+    pub fn regions_live_at(&self, location: T::Point) -> &[T::Region] {
         assert!(self.dump_enabled);
         match self.region_live_at.get(&location) {
             Some(v) => v,
             None => &[],
         }
     }
 
-    pub fn subsets_at(&self, location: Point) -> Cow<'_, BTreeMap<Region, BTreeSet<Region>>> {
+    pub fn subsets_at(&self, location: T::Point) -> Cow<'_, BTreeMap<T::Region, BTreeSet<T::Region>>> {
         assert!(self.dump_enabled);
         match self.subset.get(&location) {
             Some(v) => Cow::Borrowed(v),