Merge pull request swiftlang#6142 from practicalswift/gardening-20161208

Author: swift-ci

lib/AST/GenericEnvironment.cpp

@@ -49,7 +49,7 @@ void GenericEnvironment::setOwningDeclContext(DeclContext *newNowningDC) {
   if (!newNowningDC || OwningDC == newNowningDC)
     return;
 
-  // If we have found a outer context sharing the same generic environment,
+  // If we have found an outer context sharing the same generic environment,
   // use that.
   if (OwningDC->isChildContextOf(newNowningDC)) {
     OwningDC = newNowningDC;

utils/swift_build_support/tests/products/test_swift.py

@@ -82,7 +82,8 @@ def test_by_default_no_cmake_options(self):
             toolchain=self.toolchain,
             source_dir='/path/to/src',
             build_dir='/path/to/build')
-        self.assertEqual(swift.cmake_options, ['-DCMAKE_EXPORT_COMPILE_COMMANDS=TRUE'])
+        self.assertEqual(swift.cmake_options, [
+                         '-DCMAKE_EXPORT_COMPILE_COMMANDS=TRUE'])
 
     def test_swift_runtime_tsan(self):
         self.args.enable_tsan_runtime = True
@@ -240,7 +241,7 @@ def test_benchmark_flags(self):
         self.assertEqual(
             ['-DSWIFT_BENCHMARK_NUM_ONONE_ITERATIONS=20',
              '-DSWIFT_BENCHMARK_NUM_O_ITERATIONS=3'],
-        [x for x in swift.cmake_options if 'SWIFT_BENCHMARK_NUM' in x])
+            [x for x in swift.cmake_options if 'SWIFT_BENCHMARK_NUM' in x])
         self.args.benchmark_num_onone_iterations = 3
 
         self.args.benchmark_num_o_iterations = 30
@@ -276,4 +277,5 @@ def test_sil_ownership_flags(self):
             build_dir='/path/to/build')
         self.assertEqual(
             ['-DSWIFT_STDLIB_ENABLE_SIL_OWNERSHIP=TRUE'],
-            [x for x in swift.cmake_options if 'SWIFT_STDLIB_ENABLE_SIL_OWNERSHIP' in x])
+            [x for x in swift.cmake_options
+             if 'SWIFT_STDLIB_ENABLE_SIL_OWNERSHIP' in x])