[NFC] Minor edits.

- Fit lines within 80 columns (addresses feedback by @lattner).
- Rename `DictionaryLiteral` to `KeyValuePairs`.

Author: dan-zheng

lib/Sema/CSApply.cpp

@@ -7464,8 +7464,8 @@ Expr *ExprRewriter::finishApply(ApplyExpr *apply, Type openedType,
     // We're constructing a value of nominal type. Look for the constructor or
     // enum element to use.
     auto ctorLocator = cs.getConstraintLocator(
-                   locator.withPathElement(ConstraintLocator::ApplyFunction)
-                          .withPathElement(ConstraintLocator::ConstructorMember));
+        locator.withPathElement(ConstraintLocator::ApplyFunction)
+               .withPathElement(ConstraintLocator::ConstructorMember));
     auto selected = solution.getOverloadChoiceIfAvailable(ctorLocator);
     if (!selected) {
       assert(ty->hasError() || ty->hasUnresolvedType());
@@ -7486,7 +7486,8 @@ Expr *ExprRewriter::finishApply(ApplyExpr *apply, Type openedType,
                                    /*dotLoc=*/SourceLoc(), choice,
                                    DeclNameLoc(fn->getEndLoc()),
                                    selected->openedType, locator, ctorLocator,
-                                   /*Implicit=*/true, choice.getFunctionRefKind(),
+                                   /*Implicit=*/true,
+                                   choice.getFunctionRefKind(),
                                    AccessSemantics::Ordinary, isDynamic);
     if (!declRef)
       return nullptr;

lib/Sema/CSSimplify.cpp

@@ -4529,8 +4529,9 @@ lookupDynamicCallableMethods(Type type, ConstraintSystem &CS,
     auto cand = cast<FuncDecl>(choice.getDecl());
     return !isValidDynamicCallableMethod(cand, decl, CS.TC, hasKeywordArgs);
   };
-  candidates.erase(std::remove_if(candidates.begin(), candidates.end(), filter),
-                   candidates.end());
+  candidates.erase(
+      std::remove_if(candidates.begin(), candidates.end(), filter),
+      candidates.end());
 
   llvm::DenseSet<FuncDecl *> methods;
   for (auto candidate : candidates)
@@ -4539,8 +4540,8 @@ lookupDynamicCallableMethods(Type type, ConstraintSystem &CS,
 }
 
 /// Looks up and returns the @dynamicCallable required methods (if they exist)
-/// implemented by a type. This function should not be called directly: instead,
-/// call `getDynamicCallableMethods` which performs caching.
+/// implemented by a type. This function should not be called directly:
+/// instead, call `getDynamicCallableMethods` which performs caching.
 static DynamicCallableMethods
 lookupDynamicCallableMethods(Type type, ConstraintSystem &CS,
                              const ConstraintLocatorBuilder &locator) {
@@ -4550,13 +4551,14 @@ lookupDynamicCallableMethods(Type type, ConstraintSystem &CS,
     lookupDynamicCallableMethods(type, CS, locator, ctx.Id_withArguments,
                                  /*hasKeywordArgs*/ false);
   methods.keywordArgumentsMethods =
-    lookupDynamicCallableMethods(type, CS, locator, ctx.Id_withKeywordArguments,
+    lookupDynamicCallableMethods(type, CS, locator,
+                                 ctx.Id_withKeywordArguments,
                                  /*hasKeywordArgs*/ true);
   return methods;
 }
 
-/// Returns the @dynamicCallable required methods (if they exist) implemented by
-/// a type.
+/// Returns the @dynamicCallable required methods (if they exist) implemented
+/// by a type.
 /// This function may be slow for deep class hierarchies and multiple protocol
 /// conformances, but it is invoked only after other constraint simplification
 /// rules fail.
@@ -4640,10 +4642,10 @@ getDynamicCallableMethods(Type type, ConstraintSystem &CS,
 
 ConstraintSystem::SolutionKind
 ConstraintSystem::simplifyDynamicCallableApplicableFnConstraint(
-                                             Type type1,
-                                             Type type2,
-                                             TypeMatchOptions flags,
-                                             ConstraintLocatorBuilder locator) {
+                                            Type type1,
+                                            Type type2,
+                                            TypeMatchOptions flags,
+                                            ConstraintLocatorBuilder locator) {
   auto &ctx = getASTContext();
 
   // By construction, the left hand side is a function type: $T1 -> $T2.
@@ -4675,8 +4677,9 @@ ConstraintSystem::simplifyDynamicCallableApplicableFnConstraint(
   if (desugar2->isTypeVariableOrMember())
     return formUnsolved();
 
-  // If right-hand side is a function type, it must be a valid `dynamicallyCall`
-  // method type. Bind the output and convert the argument to the input.
+  // If right-hand side is a function type, it must be a valid
+  // `dynamicallyCall` method type. Bind the output and convert the argument
+  // to the input.
   auto func1 = type1->castTo<FunctionType>();
   if (auto func2 = dyn_cast<FunctionType>(desugar2)) {
     // The argument type must be convertible to the input type.

test/SILGen/dynamic_callable_attribute.swift

@@ -5,7 +5,7 @@
 @dynamicCallable
 public struct Callable {
   func dynamicallyCall(withArguments: [Int]) {}
-  func dynamicallyCall(withKeywordArguments: DictionaryLiteral<String, Int>) {}
+  func dynamicallyCall(withKeywordArguments: KeyValuePairs<String, Int>) {}
 }
 
 @_silgen_name("foo")