Minor edits.

Author: dan-zheng

lib/Sema/DerivedConformances.cpp

@@ -193,7 +193,7 @@ ValueDecl *DerivedConformance::getDerivableRequirement(TypeChecker &tc,
   // the provided requirement, but within the given known protocol.
   // SWIFT_ENABLE_TENSORFLOW
   auto getRequirement = [&](KnownProtocolKind kind,
-                            std::function<bool(ValueDecl *)> filter =
+                            llvm::function_ref<bool(ValueDecl *)> filter =
                                 nullptr) -> ValueDecl * {
     // Dig out the protocol.
     auto proto = ctx.getProtocol(kind);

test/stdlib/ElementaryFunctions.swift.gyb

@@ -34,9 +34,6 @@ func expectEqualWithNaNEquality<T>(
   _ expected: [T], _ actual: [T], file: String = #file, line: UInt = #line
 ) where T: BinaryFloatingPoint {
   for (x, y) in zip(expected, actual) {
-    if x == y || x.isNaN && y.isNaN {
-      continue
-    }
     expectTrue(x == y || x.isNaN && y.isNaN,
                "\(x) != \(y) for \(T.self).",
                file: file, line: line)