Fix merge conflict with master #667
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add a note to the README that `update-checkout` does not support non-ASCII characters in the path to `swift-source`.
Curried functions were removed in 2016 in 983a674.
Co-Authored-By: Ben Rimmington <[email protected]>
…in their parameter lists. Resolves rdar://problem/61461022
This reverts commit 8f01b2c.
This allows us to start splitting up the swift and C/C++ specific paths.
Unfortunately, the types are not imported through the clang importer. Add them to the overlay for use in applications.
…ame.
This change makes us treat it exactly as we do 'init'. We don't allow renaming the base name,
and don't fail if the basename doesn't match for calls.
Also:
- explicit init calls/references like `MyType.init(42)` are now reported with
'init' as a keywordBase range, rather than nothing.
- cursor info no longer reports rename as available on init/callAsFunction
calls without arguments, as there's nothing to rename in that case.
- Improved detection of when a referenced function is a call (rather than
reference) across syntactic rename, cursor-info, and indexing.
Resolves rdar://problem/60340429
Add the ShellCore module to the Windows SDK modulemap.
Platform: add ShellCore to WinSDK modulemap
WinSDK: add some constants for the SDK overlay
The `line-directive-tool` is Python3 compliant. Use the Python3 interpreter to execute this tool.
[Index][SR-9567] Allow unavailable decls to be walked
[Gardening] Change Xcode link
…-callAsFunction [IDE][Refactoring] Handle 'callAsFunction' specially in syntactic rename
[SourceKit/CodeFormat] Column-align enum element decls and the items in their parameter lists.
Correct the maximal floating point width. Although technically, Android could support FP128 on AArch64, Swift does not currently support FP128. For now, ensure that we use FP64 on Android.
Removed a description of curried functions
To ease the burden on the client, ignore some generic requirements involving
Self. For example, `Self: P` where we already know that `Self` conforms to `P`.
An example case:
```
public struct S: Equatable {
public static func ==(lhs: S, rhs: S) -> Bool { ... }
}
```
`!=` is defined in terms of `Self` and the default implementation has a `Self:
Equatable`. For the purposes of documentation, it's not necessary to specify
that again on the page of documentation for `!=`.
rdar://60963924
build: duplicate and rename the `_add_variant_*` functions
…Only types" This reverts commit 4e8867e.
CocoaError.Code.fileReadUnknown conflicts with the CHECK-NOT line here. We should be checking more specifically for UnknownBlock and UnknownCode anyways. rdar://53284293
stdlib: android does not support FP80
…3924-ignore-some-self-reqs [SymbolGraph] Ignore some Self requirements
…mcachedoperaiton [CodeCompletion][NFC] Fix typo
build: explicitly execute `line-directive-tool` with Python3
Move the source files from ParserSIL into the SIL library and remove the ParserSIL library. ParsersSIL doesn't need to be its own library and this change will simplify our builds.
contextual type for property wrapper initialization
…(unsafeUninitializedCapacity:initializingWith:) (swiftlang#30134) * Removes redundant buffer zeroing * Fix compile error
…xtual-type [Property Wrappers] Use the outermost wrapper attribute type as the contextual type for property wrapper initialization
…empty-extensions Revert "[PrintAsObjC] Don't include the module for empty extensions"
Tighten-up a Foundation Deserialization Test
…-sanitize=address
kateinoigakukun
approved these changes
Apr 14, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The conflict resolution itself was trivial, the main breakage source was the introduction of
_add_target_variant_c_compile_link_flagsinAddSwiftStdlib.cmake, which is where_WASI_EMULATED_MMANhad to be moved from_add_host_variant_c_compile_link_flagsinAddSwift.cmake.