Skip to content

[gardening] Fix recently introduced typo. Fix PEP-8 violations. #6142

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 8, 2016
Merged

[gardening] Fix recently introduced typo. Fix PEP-8 violations. #6142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c87487
[gardening] Fix recently introduced typo.
practicalswift Dec 8, 2016
b2af465
[gardening] Fix PEP-8 violations.
practicalswift Dec 8, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/AST/GenericEnvironment.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 5 additions & 3 deletions utils/swift_build_support/tests/products/test_swift.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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])