add new_leaf functions

Author: BoxyUwU

compiler/rustc_next_trait_solver/src/solve/eval_ctxt/solver_region_constraints.rs

@@ -171,12 +171,12 @@ where
         use Component::*;
         use LeafRegionConstraint::*;
         match c {
-            Region(c_r) => Or::new([And::new([RegionOutlives(*c_r, r)])]),
+            Region(c_r) => Or::new_leaf(RegionOutlives(*c_r, r)),
             Placeholder(p) => {
-                Or::new([And::new([PlaceholderTyOutlives(Ty::new_placeholder(self.cx(), *p), r)])])
+                Or::new_leaf(PlaceholderTyOutlives(Ty::new_placeholder(self.cx(), *p), r))
             }
             Alias(_, alias) => self.destructure_alias_outlives(*alias, r),
-            UnresolvedInferenceVariable(_) => Or::new([And::new([Ambiguity])]),
+            UnresolvedInferenceVariable(_) => Or::new_ambig(),
             Param(_) => panic!("Params should have been canonicalized to placeholders"),
             EscapingAlias(components) => self.destructure_components(components, r),
         }
@@ -198,8 +198,7 @@ where
                 .map(|bound| And::new([RegionOutlives(bound, r)]));
         let item_bound_outlives = Or::new(item_bounds);
 
-        let where_clause_outlives =
-            Or::new([And::new([AliasTyOutlivesViaEnv(Binder::dummy((alias, r)))])]);
+        let where_clause_outlives = Or::new_leaf(AliasTyOutlivesViaEnv(Binder::dummy((alias, r))));
 
         let mut components = Default::default();
         rustc_type_ir::outlives::compute_alias_components_recursive(

compiler/rustc_next_trait_solver/src/solve/mod.rs

@@ -124,12 +124,11 @@ where
 
         if self.cx().assumptions_on_binders() {
             use rustc_type_ir::region_constraint::{
-                And, CanonicalFormRegionConstraint, LeafRegionConstraint, Or,
+                CanonicalFormRegionConstraint, LeafRegionConstraint,
             };
 
-            let constraint = CanonicalFormRegionConstraint::new_from_or(Or::new([And::new([
-                LeafRegionConstraint::RegionOutlives(a, b),
-            ])]));
+            let constraint =
+                CanonicalFormRegionConstraint::new_leaf(LeafRegionConstraint::RegionOutlives(a, b));
             self.register_solver_region_constraint(constraint);
         } else {
             self.register_region_outlives(a, b, VisibleForLeakCheck::Yes);

compiler/rustc_type_ir/src/region_constraint.rs

@@ -160,6 +160,14 @@ impl<I: Interner> Or<I> {
         Self(new_ands.into_boxed_slice())
     }
 
+    pub fn new_ambig() -> Self {
+        Or::new_leaf(LeafRegionConstraint::Ambiguity)
+    }
+
+    pub fn new_leaf(l: LeafRegionConstraint<I>) -> Self {
+        Or(Box::new([And(Box::new([l]))]))
+    }
+
     pub fn new_and(a: Or<I>, b: Or<I>) -> Self {
         // I think this returns false if either a or b is false?
         let mut ands = Vec::new();
@@ -285,6 +293,13 @@ impl<I: Interner> CanonicalFormRegionConstraint<I> {
             false
         }
     }
+
+    pub fn new_leaf(l: LeafRegionConstraint<I>) -> Self {
+        CanonicalFormRegionConstraint {
+            and_constraint: And(Box::new([l])),
+            or_constraint: Or::new_true(),
+        }
+    }
 }
 
 impl<I: Interner> Default for CanonicalFormRegionConstraint<I> {
@@ -509,21 +524,21 @@ fn pull_region_outlives_constraints_out_of_universe<
             match c {
                 Ambiguity | PlaceholderTyOutlives(..) | AliasTyOutlivesViaEnv(..) => {
                     assert!(max_universe(infcx, c.clone()) < u);
-                    pulled_constraints.push(Or::new([And::new([c.clone()])]));
+                    pulled_constraints.push(Or::new_leaf(c.clone()));
                 }
                 RegionOutlives(region_1, region_2) => {
                     let region_1_u = max_universe(infcx, region_1);
                     let region_2_u = max_universe(infcx, region_2);
 
                     if region_1_u != u && region_2_u != u {
-                        pulled_constraints.push(Or::new([And::new([c])]));
+                        pulled_constraints.push(Or::new_leaf(c));
                         continue;
                     }
 
                     let assumptions = match assumptions {
                         Some(assumptions) => assumptions,
                         None => {
-                            pulled_constraints.push(Or::new([And::new([Ambiguity])]));
+                            pulled_constraints.push(Or::new_ambig());
                             continue;
                         }
                     };
@@ -588,7 +603,7 @@ pub fn destructure_type_outlives_constraints_in_root<
         let mut ors = Vec::new();
         for c in &and.0 {
             match c {
-                Ambiguity | RegionOutlives(..) => ors.push(Or::new([And::new([c.clone()])])),
+                Ambiguity | RegionOutlives(..) => ors.push(Or::new_leaf(c.clone())),
                 PlaceholderTyOutlives(ty, r) => ors.push(Or::new(
                     regions_outlived_by_placeholder(*ty, assumptions, infcx.cx())
                         .map(move |assumption_r| And::new([RegionOutlives(assumption_r, *r)])),
@@ -651,7 +666,7 @@ fn rewrite_type_outlives_constraints_in_universe_for_eager_placeholder_handling<
         let mut ors = Vec::new();
         for c in and.0 {
             match c {
-                Ambiguity | RegionOutlives(..) => ors.push(Or::new([And::new([c])])),
+                Ambiguity | RegionOutlives(..) => ors.push(Or::new_leaf(c)),
                 PlaceholderTyOutlives(ty, region) => {
                     ors.push(rewrite_placeholder_ty_outlives_constraints_in_universe_for_eager_placeholder_handling(infcx, ty, region, u, assumptions));
                 }
@@ -689,12 +704,12 @@ fn rewrite_placeholder_ty_outlives_constraints_in_universe_for_eager_placeholder
     let region_u = max_universe(infcx, region);
 
     if region_u != u && ty_u != u {
-        return Or::new([And::new([PlaceholderTyOutlives(ty, region)])]);
+        return Or::new_leaf(PlaceholderTyOutlives(ty, region));
     }
 
     let assumptions = match assumptions {
         Some(assumptions) => assumptions,
-        None => return Or::new([And::new([Ambiguity])]),
+        None => return Or::new_ambig(),
     };
 
     let mut candidates = vec![];
@@ -766,13 +781,13 @@ fn rewrite_alias_ty_outlives_constraints_in_universe_for_eager_placeholder_handl
             escaping_outlives,
             I::BoundVarKinds::from_vars(infcx.cx(), bound_vars),
         );
-        candidates.push(Or::new([And::new([AliasTyOutlivesViaEnv(bound_outlives)])]));
+        candidates.push(Or::new_leaf(AliasTyOutlivesViaEnv(bound_outlives)));
     }
 
     let assumptions = match assumptions {
         Some(assumptions) => assumptions,
         None => {
-            candidates.push(Or::new([And::new([Ambiguity])]));
+            candidates.push(Or::new_ambig());
             return candidates.into_iter().fold(Or::new_false(), |acc, c| Or::new_or(acc, c));
         }
     };
@@ -820,7 +835,7 @@ fn rewrite_alias_ty_outlives_constraints_in_universe_for_eager_placeholder_handl
     // let's be conservative and not let alias outlives' cause NoSolution
     // in coherence
     match infcx.typing_mode_raw() {
-        TypingMode::Coherence => candidates.push(Or::new([And::new([Ambiguity])])),
+        TypingMode::Coherence => candidates.push(Or::new_ambig()),
         TypingMode::Typeck { .. }
         | TypingMode::Reflection
         | TypingMode::ErasedNotCoherence { .. }