Skip to content

Commit 09b3b4b

Browse files
committed
Merge branch 'main' into grammar-compound-modifiers
2 parents 8fef70d + bc07600 commit 09b3b4b

File tree

6,867 files changed

+552096
-313962
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

6,867 files changed

+552096
-313962
lines changed

.editorconfig

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# editorconfig.org
2+
3+
root = true
4+
5+
[*]
6+
indent_style = space
7+
indent_size = 2
8+
insert_final_newline = true

.flake8

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ filename =
4444
exclude =
4545
.git,
4646
__pycache__,
47+
.build,
4748

4849
ignore =
4950
# The black tool treats slices consistently, the E203 warning is not PEP8

.github/CODEOWNERS

Lines changed: 44 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,12 @@
3131
# TODO: /LICENSE.txt
3232
# TODO: /README.md
3333

34+
# Runtimes
35+
/Runtimes/**/*.cmake @etcwilde @compnerd @edymtt @justice-adams-apple
36+
/Runtimes/**/CMakeLists.txt @etcwilde @compnerd @edymtt @justice-adams-apple
37+
/Runtimes/Core/cmake/caches/Vendors/Apple/ @etcwilde @shahmishal @edymtt @justice-adams-apple
38+
/Runtimes/Core/cmake/modules/ExperimentalFeatures.cmake @tshortli @etcwilde @compnerd @edymtt @justice-adams-apple
39+
3440
# SwiftCompilerSources
3541
/SwiftCompilerSources @eeckstein
3642

@@ -47,6 +53,11 @@
4753
/cmake/**/*Windows* @compnerd
4854

4955
# docs
56+
/docs/ABI/ @rjmccall
57+
/docs/ABI/*Mangling* @eeckstein
58+
/docs/ABI/GenericSignature.md @slavapestov
59+
/docs/ABI/KeyPaths.md @jckarter
60+
/docs/ABI/RegisterUsage.md @al45tair
5061
/docs/CrossCompilationModel.md @MaxDesiatov
5162
/docs/Generics @slavapestov
5263
/docs/HowToGuides/ @AnthonyLatsis @LucianoPAlmeida @xedin
@@ -55,7 +66,7 @@
5566
/docs/Windows* @compnerd
5667

5768
# include
58-
/include/swift-c/DependencyScan/ @artemcm
69+
/include/swift-c/DependencyScan/ @artemcm @cachemeifyoucan
5970
/include/swift/*Demangl*/ @rjmccall
6071
/include/swift/AST/ @hborla @slavapestov @xedin
6172
/include/swift/AST/*Availability* @tshortli
@@ -66,12 +77,21 @@
6677
/include/swift/AST/*Protocol* @hborla @slavapestov
6778
/include/swift/AST/*Requirement* @hborla @slavapestov
6879
/include/swift/AST/*Substitution* @slavapestov
80+
/include/swift/AST/DiagnosticGroup* @DougGregor
81+
/include/swift/AST/DiagnosticsClangImporter.def @zoecarver @egorzhdan @beccadax @ian-twilightcoder @Xazax-hun @j-hui @fahadnayyar @susmonteiro
82+
/include/swift/AST/DiagnosticsDriver.def @artemcm
83+
/include/swift/AST/DiagnosticsFrontend.def @artemcm @tshortli
84+
/include/swift/AST/DiagnosticsIDE.def @ahoppen @bnbarham @hamishknight @rintaro
85+
/include/swift/AST/DiagnosticsIRGen.def @rjmccall
86+
/include/swift/AST/DiagnosticsModuleDiffer.def @nkcsgexi
6987
/include/swift/AST/DiagnosticsParse.def @ahoppen @bnbarham @CodaFi @DougGregor @hamishknight @rintaro
88+
/include/swift/AST/DiagnosticsRefactoring.def @ahoppen @bnbarham @hamishknight @rintaro
89+
/include/swift/AST/DiagnosticsSIL.def @jckarter
7090
/include/swift/AST/Evaluator* @CodaFi @slavapestov
7191
/include/swift/Basic/ @DougGregor
7292
/include/swift/Basic/Features.def @DougGregor @hborla
73-
/include/swift/ClangImporter @zoecarver @hyp @egorzhdan @beccadax @ian-twilightcoder
74-
/include/swift/DependencyScan @artemcm
93+
/include/swift/ClangImporter @zoecarver @egorzhdan @beccadax @ian-twilightcoder @Xazax-hun @j-hui @fahadnayyar @susmonteiro
94+
/include/swift/DependencyScan @artemcm @cachemeifyoucan
7595
/include/swift/Driver*/ @artemcm
7696
/include/swift/Frontend*/ @artemcm @tshortli
7797
/include/swift/IDE/ @ahoppen @bnbarham @hamishknight @rintaro
@@ -81,9 +101,9 @@
81101
/include/swift/Migrator/ @nkcsgexi
82102
/include/swift/Option/*Options* @tshortli
83103
/include/swift/Parse/ @ahoppen @bnbarham @CodaFi @DougGregor @hamishknight @rintaro
84-
/include/swift/PrintAsClang @zoecarver @hyp @egorzhdan
104+
/include/swift/PrintAsClang @zoecarver @egorzhdan @Xazax-hun @j-hui @fahadnayyar @susmonteiro
85105
/include/swift/Refactoring @ahoppen @bnbarham @hamishknight @rintaro
86-
/include/swift/Runtime/ @rjmccall
106+
/include/swift/Runtime/ @rjmccall @compnerd
87107
/include/swift/SIL/ @jckarter
88108
/include/swift/SIL/*Coverage* @ahoppen @bnbarham @hamishknight @rintaro
89109
/include/swift/SIL/*DebugInfo* @adrian-prantl
@@ -116,9 +136,9 @@
116136
/lib/ASTGen/ @ahoppen @bnbarham @CodaFi @hamishknight @rintaro
117137
/lib/Basic/ @DougGregor
118138
/lib/Basic/Windows @compnerd
119-
/lib/ClangImporter @zoecarver @hyp @egorzhdan @beccadax @ian-twilightcoder
139+
/lib/ClangImporter @zoecarver @egorzhdan @beccadax @ian-twilightcoder @Xazax-hun @j-hui @fahadnayyar @susmonteiro
120140
/lib/ClangImporter/DWARFImporter* @adrian-prantl
121-
/lib/DependencyScan @artemcm
141+
/lib/DependencyScan @artemcm @cachemeifyoucan
122142
/lib/Driver*/ @artemcm
123143
/lib/DriverTool/autolink_extract_main.cpp @MaxDesiatov @etcwilde
124144
/lib/DriverTool/sil* @jckarter
@@ -132,10 +152,11 @@
132152
/lib/IRGen/*Debug* @adrian-prantl
133153
/lib/IRGen/*Distributed* @ktoso
134154
/lib/Index/ @ahoppen @bnbarham @hamishknight @rintaro
155+
/lib/Macros/Sources/SwiftMacros/Swiftify* @hnrklssn @Xazax-hun
135156
/lib/Markup/ @nkcsgexi
136157
/lib/Migrator/ @nkcsgexi
137158
/lib/Parse/ @ahoppen @bnbarham @CodaFi @DougGregor @hamishknight @rintaro
138-
/lib/PrintAsClang @zoecarver @hyp @egorzhdan
159+
/lib/PrintAsClang @zoecarver @egorzhdan @Xazax-hun @j-hui @fahadnayyar @susmonteiro
139160
/lib/Refactoring/ @ahoppen @bnbarham @hamishknight @rintaro
140161
/lib/SIL/ @jckarter
141162
/lib/SIL/**/*DebugInfo* @adrian-prantl
@@ -158,6 +179,7 @@
158179
/lib/Sema/Constraint* @hborla @xedin
159180
/lib/Sema/DerivedConformance* @slavapestov
160181
/lib/Sema/DerivedConformanceDistributed* @ktoso @slavapestov
182+
/lib/Sema/OpenedExistentials* @AnthonyLatsis @slavapestov
161183
/lib/Sema/TypeCheckDistributed* @hborla @ktoso @xedin
162184
/lib/Sema/TypeCheckProtocol* @AnthonyLatsis @hborla @slavapestov
163185
/lib/Sema/TypeCheckType* @AnthonyLatsis @hborla @slavapestov @xedin
@@ -174,12 +196,13 @@
174196
/stdlib/ @swiftlang/standard-librarians
175197
/stdlib/private/*Runtime*/ @rjmccall
176198
/stdlib/private/SwiftReflectionTest/ @slavapestov
199+
/stdlib/public/core/Swiftify* @hnrklssn @Xazax-hun
177200
/stdlib/public/*Demangl*/ @rjmccall
178-
/stdlib/public/Backtracing/ @al45tair
179201
/stdlib/public/Concurrency/ @ktoso
180-
/stdlib/public/Cxx/ @zoecarver @hyp @egorzhdan
202+
/stdlib/public/Cxx/ @zoecarver @egorzhdan @Xazax-hun @j-hui @fahadnayyar @susmonteiro
181203
/stdlib/public/Distributed/ @ktoso
182204
/stdlib/public/Observation/ @phausler
205+
/stdlib/public/RuntimeModule/ @al45tair @mikeash
183206
/stdlib/public/SwiftRemoteMirror/ @slavapestov
184207
/stdlib/public/Threading/ @al45tair
185208
/stdlib/public/Windows/ @compnerd
@@ -202,7 +225,8 @@
202225
/test/IDE/ @ahoppen @bnbarham @hamishknight @rintaro
203226
/test/IRGen/ @rjmccall
204227
/test/Index/ @ahoppen @bnbarham @hamishknight @rintaro
205-
/test/Interop/ @zoecarver @hyp @egorzhdan
228+
/test/Interop/ @zoecarver @egorzhdan @Xazax-hun @j-hui @fahadnayyar @susmonteiro @hnrklssn
229+
/test/Macros/SwiftifyImport @hnrklssn @Xazax-hun
206230
/test/Migrator/ @nkcsgexi
207231
/test/Parse/ @ahoppen @bnbarham @CodaFi @DougGregor @hamishknight @rintaro
208232
/test/Profiler @ahoppen @bnbarham @hamishknight @rintaro
@@ -247,8 +271,8 @@
247271
/unittests/*Demangl*/ @rjmccall
248272
/unittests/AST/ @hborla @slavapestov @xedin
249273
/unittests/AST/*Evaluator* @CodaFi @slavapestov
250-
/unittests/DependencyScan/ @artemcm
251-
/unittests/FrontendTool/ @artemcm @tshortli
274+
/unittests/DependencyScan/ @artemcm @cachemeifyoucan
275+
/unittests/Frontend*/ @artemcm @tshortli
252276
/unittests/Parse/ @ahoppen @bnbarham @CodaFi @DougGregor @hamishknight @rintaro
253277
/unittests/Reflection/ @slavapestov
254278
/unittests/SIL/ @jckarter
@@ -261,15 +285,20 @@
261285

262286
# utils
263287
/utils/*windows* @compnerd
288+
/utils/build_swift/ @etcwilde @justice-adams-apple @shahmishal
289+
/utils/generate-xcode @hamishknight
264290
/utils/gyb_sourcekit_support/ @ahoppen @bnbarham @hamishknight @rintaro
265291
/utils/sourcekit_fuzzer/ @ahoppen @bnbarham @hamishknight @rintaro
292+
/utils/swift-xcodegen/ @hamishknight
293+
/utils/swift_build_support/ @etcwilde @justice-adams-apple @shahmishal
266294
/utils/swift_build_support/products/earlyswiftsyntax.py @ahoppen @bnbarham @hamishknight @rintaro
267295
/utils/swift_build_support/products/skstresstester.py @ahoppen @bnbarham @hamishknight @rintaro
268296
/utils/swift_build_support/products/sourcekitlsp.py @ahoppen @bnbarham @hamishknight @rintaro
269297
/utils/swift_build_support/products/swiftformat.py @ahoppen @allevato @bnbarham @hamishknight @rintaro
270298
/utils/swift_build_support/products/swiftsyntax.py @ahoppen @bnbarham @hamishknight @rintaro
271-
/utils/update-checkout* @shahmishal
272-
/utils/update_checkout/ @shahmishal
299+
/utils/update-checkout* @etcwilde @justice-adams-apple @shahmishal
300+
/utils/update_checkout/ @etcwilde @justice-adams-apple @shahmishal
301+
/utils/update_checkout/update-checkout-config.json @shahmishal
273302
/utils/vim/ @compnerd
274303

275304
# validation-test

.gitignore

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ docs/_build
5252

5353
# SwiftPM
5454
.build
55+
.index-build
5556
.swiftpm
5657

5758
#==============================================================================#
@@ -78,3 +79,21 @@ SortedCFDatabase.def
7879
htmlcov
7980
.coverage
8081
/benchmark/scripts/Benchmark_Driverc
82+
83+
#==============================================================================#
84+
# Ignore copied Swift Stdlib files while migrating stdlib
85+
#==============================================================================#
86+
Runtimes/**/*.swift
87+
Runtimes/**/*.h
88+
Runtimes/**/*.cpp
89+
Runtimes/**/*.c
90+
Runtimes/**/*.m
91+
Runtimes/**/*.mm
92+
Runtimes/**/*.def
93+
Runtimes/**/*.gyb
94+
Runtimes/**/*.apinotes
95+
Runtimes/**/*.yaml
96+
Runtimes/**/*.inc
97+
Runtimes/**/*.json
98+
Runtimes/**/*.modulemap
99+
Runtimes/**/*.in

.mailmap

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,9 @@ Ross Bayer <[email protected]>
134134
135135
136136
137+
Saleem Abdulrasool <[email protected]> <[email protected]>
138+
Saleem Abdulrasool <[email protected]> <[email protected]>
139+
Saleem Abdulrasool <[email protected]> <[email protected]>
137140
138141
139142
Stephen Canon <[email protected]>

0 commit comments

Comments
 (0)