Skip to content

Resolve conflicts with master #909

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 55 commits into from
May 5, 2020
Merged

Resolve conflicts with master #909

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
0342855
[NFC] Debride Pattern.h of Implicit Tri-State
CodaFi May 1, 2020
a05e072
[Diagnostics] Fix `RequirementFailure::getConformanceForConditionalRe…
xedin May 1, 2020
b4c73ab
[Diagnostics] Fix `MissingConformanceFailure::diagnoseAsError` to use…
xedin May 1, 2020
490548f
[Diagnostics] Fix `ContextualFailure` to use solution data for `hasAp…
xedin May 1, 2020
ee6c228
[Diagnostics] NFC: Move `is{Array, Collection}Type` helpers into `Fai…
xedin May 1, 2020
71f8a4e
Fixes example snippet in KeyValuePairs.swift
valeriyvan May 1, 2020
db6801b
[Diagnostics] Add `getRawType` which allows to retrieve type associat…
xedin Apr 30, 2020
b405f7c
[Diagnostics] Avoid direct use of constraint system by `MissingArgume…
xedin May 1, 2020
2d1e408
[Diagnostics] Use solution for verify presence of fix in `diagnoseUse…
xedin May 1, 2020
bf4c3b7
[Diagnostics] Use data from associated solution while diagnosing miss…
xedin May 1, 2020
5a7c70d
[Diagnostics] NFC: Add `isRawRepresentable/conformsToKnownProtocol` h…
xedin May 1, 2020
e34ee7b
Fixes example snippet in MemoryLayout.swift
valeriyvan May 1, 2020
786b16c
[Diagnostics] NFC: Switch to which doesn't require constraint system
xedin May 1, 2020
f1fcec1
[Test] Generalize api-digester tests to all platforms.
DougGregor May 1, 2020
6d12fa0
[Gardening] Fix repeated word in diagnostic message
AnthonyLatsis May 1, 2020
72f1bea
[Test] Downscope api-digester generalization to all *Apple* platforms
DougGregor May 1, 2020
8946435
Remove stray backtick in docs.
amartini51 May 1, 2020
deb25e1
Append newline to printout of "Defaulted constraints"
Jumhyn May 1, 2020
72807bf
[NFC] Don't Serialize Pattern::isImplicit
CodaFi May 1, 2020
7161ed0
Work Around IDE Structure Markers
CodaFi May 1, 2020
5500688
Fixes example snippet in ExistentialCollection.swift (#31462)
valeriyvan May 1, 2020
532b632
Sema: Make -debug-generic-signatures output legible
AnthonyLatsis Mar 27, 2020
82e04f8
Merge pull request #31480 from valeriyvan/FixExampleSnippetMemoryLayo…
swift-ci May 2, 2020
68e0103
Merge pull request #31471 from valeriyvan/FixExampleSnippetKeyValuePa…
swift-ci May 2, 2020
fb8e23e
Propagate Failures Explicitly in Opaque Type Resolution
CodaFi May 1, 2020
48651ca
[Gardening] Improve Overview of Evaluator-Based Incremental Dependencies
CodaFi May 2, 2020
8e35609
IRGen: Sign the class stub initialization callback pointer on arm64e
slavapestov May 1, 2020
fa69a34
Merge pull request #31487 from amartini51/master
swift-ci May 2, 2020
942e8fb
Merge pull request #31489 from Jumhyn/constraint-system-dump-newline
swift-ci May 2, 2020
278fb49
Merge pull request #31486 from AnthonyLatsis/diag-dup-word
CodaFi May 2, 2020
2788747
Merge pull request #31479 from xedin/audit-use-of-cs-in-diags
xedin May 2, 2020
a15dbce
Merge pull request #31491 from AnthonyLatsis/debug-gen-sigs
CodaFi May 2, 2020
d0f8be1
Merge pull request #31492 from CodaFi/foia
swift-ci May 2, 2020
9eab9f3
Fixes example snippets in MutableCollection.swift
valeriyvan May 2, 2020
30f8b55
Merge pull request #31490 from slavapestov/fix-class-stub-arm64e
slavapestov May 2, 2020
a021e6c
Merge pull request #31461 from CodaFi/right-said-fred
CodaFi May 2, 2020
b196ee9
Merge pull request #31485 from DougGregor/generalize-api-digester-tests
DougGregor May 2, 2020
b312615
Merge pull request #31484 from CodaFi/opaque-results-may-vary
CodaFi May 2, 2020
76a9f68
Merge pull request #31495 from valeriyvan/FixExampleSnippetsMutableCo…
swift-ci May 2, 2020
210af1c
[Gardening] De-RST the Lexicon
CodaFi May 2, 2020
7d8c754
Fixes example snippet in Reverse.swift
valeriyvan May 2, 2020
4b555bb
Merge pull request #31498 from CodaFi/lexical-scope
CodaFi May 2, 2020
959eab0
[Gardening] Update reference to lexicon
CodaFi May 2, 2020
2753fc5
Diags: Use the declared type for diagnosing inheritance from final class
AnthonyLatsis May 2, 2020
b121ce9
Merge pull request #31501 from CodaFi/nine-iron
swift-ci May 2, 2020
6b14c2a
[Docs] Clarifies `Identifiable` requirements (#31472)
May 2, 2020
291ddb7
Merge pull request #31504 from AnthonyLatsis/final-superclass-nested
AnthonyLatsis May 2, 2020
35e8978
Merge pull request #31500 from valeriyvan/FixExampleSnippetReverse.swift
CodaFi May 2, 2020
d14bb1e
Driver: sink the `static-stdlib-args.lnk` generation
compnerd May 1, 2020
5ac1926
[CSDiagnostics] Break to the fallbacks when no specific diagnostics i…
LucianoPAlmeida May 3, 2020
08be3d2
[tests] Add SR-12725 tests
LucianoPAlmeida May 3, 2020
11b9586
Merge pull request #31510 from compnerd/static-stdlib
drexin May 3, 2020
1f0ecc6
Merge pull request #31511 from LucianoPAlmeida/SR-12725-diagnostics-g…
xedin May 3, 2020
a9bb59f
Merge branch 'master' of github.com:swiftwasm/swift into maxd/master-…
MaxDesiatov May 3, 2020
b340b21
Fix lowercase_sdk not redefined in runtime CMake
MaxDesiatov May 5, 2020
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 docs/Driver.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Some terms:

- For the purposes of this document, a _module_ is a single distributable unit
of API. (We use this term for a lot of other things too, though; check out
[Lexicon.rst](Lexicon.rst) for the full list.) "Foundation" is a single
[Lexicon.md](Lexicon.md) for the full list.) "Foundation" is a single
module, as is the Swift standard library ("Swift"). An app is a module too.

- A _compilation unit_ is a set of source files that are compiled together. In
Expand Down
Loading