---

yaml
---
r: 346861
b: refs/heads/master
c: 1f127a3
h: refs/heads/master
i:
  346859: 14458ff

Author: swift-ci

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: f5d7e7aa960e4e8b87578feed7a69fd82e759bfe
+refs/heads/master: 1f127a38fb52d1506370fc629c12bccf68c2f13c
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/lib/IDE/Formatting.cpp

@@ -575,7 +575,7 @@ class FormatWalker : public SourceEntityWalker {
       };
 
       if (auto AE = dyn_cast_or_null<ApplyExpr>(Node.dyn_cast<Expr *>())) {
-        // PrefixUnaryExpr shouldn't be syntacticly considered as a funtion call
+        // PrefixUnaryExpr shouldn't be syntactically considered as a function call
         // for sibling alignment.
         if (!isa<PrefixUnaryExpr>(AE)) {
           collect(AE->getArg());

trunk/tools/SourceKit/tools/swift-lang/CMakeLists.txt

@@ -5,6 +5,8 @@ if(NOT SWIFT_SOURCEKIT_USE_INPROC_LIBRARY AND SWIFT_BUILD_STDLIB)
   set(DEPENDS_LIST "sourcekitd-test")
 
   # The build type of swiftlang should agree with stdlib
+  # This setting could avoid us adding additional search paths when building
+  # executables using SwiftLang.
   set(SWIFT_LANG_LIBRARY_BUILD_TYPES)
   if(SWIFT_BUILD_DYNAMIC_STDLIB)
     list(APPEND SWIFT_LANG_LIBRARY_BUILD_TYPES SHARED)