averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into swift-3-indexing-model

Browse Source
This commit is contained in:
Dmitri Gribenko
2016-04-25 13:50:09 -07:00
parent e733a9b194 5d315ae30b
commit b75d2b9df4
132 changed files with 6327 additions and 8651 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
stdlib/public/core/CompilerProtocols.swift
View File

@@ -436,21 +436,21 @@ public protocol StringInterpolationConvertible {
}
/// Conforming types can be initialized with color literals (e.g.
/// `[#Color(colorLiteralRed: 1, green: 0, blue: 0, alpha: 1)#]`).
/// `#colorLiteral(red: 1, green: 0, blue: 0, alpha: 1)`).
public protocol _ColorLiteralConvertible {
init(colorLiteralRed: Float, green: Float, blue: Float, alpha: Float)
init(red: Float, green: Float, blue: Float, alpha: Float)
}
/// Conforming types can be initialized with image literals (e.g.
/// `[#Image(imageLiteral: "hi.png")#]`).
/// `#imageLiteral(resourceName: "hi.png")`).
public protocol _ImageLiteralConvertible {
init(imageLiteral: String)
init(resourceName: String)
}
/// Conforming types can be initialized with strings (e.g.
/// `[#FileReference(fileReferenceLiteral: "resource.txt")#]`).
/// `#fileLiteral(resourceName: "resource.txt")`).
public protocol _FileReferenceLiteralConvertible {
init(fileReferenceLiteral: String)
init(resourceName: String)
}
/// A container is destructor safe if whether it may store to memory on