Skip to content

Commit e901e17

Browse files
committed
Update master to build with Xcode 10.2 beta 1
1 parent 77d1c02 commit e901e17

File tree

4 files changed

+6
-29
lines changed

4 files changed

+6
-29
lines changed

stdlib/public/SDK/Foundation/NSString.swift

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,6 @@
1616
// Strings
1717
//===----------------------------------------------------------------------===//
1818

19-
@available(*, unavailable, message: "Please use String or NSString")
20-
public class NSSimpleCString {}
21-
22-
@available(*, unavailable, message: "Please use String or NSString")
23-
public class NSConstantString {}
24-
2519
extension NSString : ExpressibleByStringLiteral {
2620
/// Create an instance initialized to `value`.
2721
public required convenience init(stringLiteral value: StaticString) {

stdlib/public/SDK/SceneKit/SceneKit.swift.gyb

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -179,21 +179,15 @@ extension SCNGeometryElement {
179179
extension SCNGeometrySource {
180180
@nonobjc
181181
public convenience init(vertices: [SCNVector3]) {
182-
fatalError()
183-
// FIXME: <rdar://problem/43534146>
184-
// self.init(__vertices: vertices, count: vertices.count)
182+
self.init(__vertices: vertices, count: vertices.count)
185183
}
186184
@nonobjc
187185
public convenience init(normals: [SCNVector3]) {
188-
fatalError()
189-
// FIXME: <rdar://problem/43534146>
190-
// self.init(__normals: normals, count: normals.count)
186+
self.init(__normals: normals, count: normals.count)
191187
}
192188
@nonobjc
193189
public convenience init(textureCoordinates: [CGPoint]) {
194-
fatalError()
195-
// FIXME: <rdar://problem/43534146>
196-
// self.init(__textureCoordinates: textureCoordinates, count: textureCoordinates.count)
190+
self.init(__textureCoordinates: textureCoordinates, count: textureCoordinates.count)
197191
}
198192
}
199193

test/Interpreter/SDK/FoundationDiagnostics.swift

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,6 @@
44

55
import Foundation
66

7-
func useUnavailable() {
8-
var a = NSSimpleCString() // expected-error {{'NSSimpleCString' is unavailable}}
9-
var b = NSConstantString() // expected-error {{'NSConstantString' is unavailable}}
10-
}
11-
127
func encode(_ string: String) {
138
_ = string.cString(using: NSUTF8StringEncoding) // expected-error {{'NSUTF8StringEncoding' has been renamed to 'String.Encoding.utf8'}} {{29-49=String.Encoding.utf8}}
149
let _: NSStringEncoding? = nil // expected-error {{'NSStringEncoding' has been renamed to 'String.Encoding'}} {{10-26=String.Encoding}}

validation-test/stdlib/SceneKit.swift

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -132,9 +132,7 @@ if #available(iOS 8.0, *) {
132132
expectEqual(1, element.bytesPerIndex)
133133
}
134134

135-
SceneKitTests.test("SCNGeometrySource.init(vertices:)")
136-
.skip(.always("rdar://problem/43534146"))
137-
.code {
135+
SceneKitTests.test("SCNGeometrySource.init(vertices:)") {
138136
let source = SCNGeometrySource(vertices: [SCNVector3(1, 2, 3),
139137
SCNVector3(4, 5, 6)])
140138

@@ -148,9 +146,7 @@ if #available(iOS 8.0, *) {
148146
expectEqual(positions[4], 5)
149147
}
150148

151-
SceneKitTests.test("SCNGeometrySource.init(normals:)")
152-
.skip(.always("rdar://problem/43534146"))
153-
.code {
149+
SceneKitTests.test("SCNGeometrySource.init(normals:)") {
154150
let source = SCNGeometrySource(normals: [SCNVector3(1, 2, 3),
155151
SCNVector3(4, 5, 6)])
156152

@@ -164,9 +160,7 @@ if #available(iOS 8.0, *) {
164160
expectEqual(normals[4], 5)
165161
}
166162

167-
SceneKitTests.test("SCNGeometrySource.init(textureCoordinates:)")
168-
.skip(.always("rdar://problem/43534146"))
169-
.code {
163+
SceneKitTests.test("SCNGeometrySource.init(textureCoordinates:)") {
170164
let source = SCNGeometrySource(textureCoordinates: [CGPoint(x: 1, y: 2),
171165
CGPoint(x: 4, y: 5)])
172166

0 commit comments

Comments
 (0)