[Constraint solver] Address some of Mark's comments. NFC

Author: DougGregor

lib/Sema/CSSimplify.cpp

@@ -3776,9 +3776,7 @@ ConstraintSystem::simplifyRestrictedConstraintImpl(
                                         getConstraintLocator(locator));
 
         Constraint *disjunctionChoices[] = {int8Con, uint8Con, voidCon};
-        addUnsolvedConstraint(
-          Constraint::createDisjunction(*this, disjunctionChoices,
-                                        getConstraintLocator(locator)));
+        addDisjunctionConstraint(disjunctionChoices, locator);
         return SolutionKind::Solved;
       }
 

lib/Sema/ConstraintSystem.h

@@ -1858,9 +1858,8 @@ class ConstraintSystem {
   ///
   /// \returns the result of performing the tuple-to-tuple conversion.
   SolutionKind matchTupleTypes(TupleType *tuple1, TupleType *tuple2,
-                                         TypeMatchKind kind,
-                               TypeMatchOptions flags,
-                                         ConstraintLocatorBuilder locator);
+                               TypeMatchKind kind, TypeMatchOptions flags,
+                               ConstraintLocatorBuilder locator);
 
   /// \brief Subroutine of \c matchTypes(), which matches a scalar type to
   /// a tuple type.