Merge pull request #3667 from parkera/rename_nsoutputstream

swift-ci · web-flow · commit 00934a74eb9f · 2016-07-24T13:59:07.000-07:00
diff --git a/apinotes/Foundation.apinotes b/apinotes/Foundation.apinotes
@@ -1007,8 +1007,6 @@ Classes:
   SwiftName: NSURLHandle
 - Name: NSMachPort
   SwiftName: NSMachPort
-- Name: NSOutputStream
-  SwiftName: NSOutputStream
 - Name: NSRegularExpression
   SwiftName: NSRegularExpression
 - Name: NSComparisonPredicate
diff --git a/stdlib/public/core/OutputStream.swift b/stdlib/public/core/OutputStream.swift
@@ -73,9 +73,6 @@ public protocol TextOutputStream {
   mutating func write(_ string: String)
 }
 
-/// Temporary typealias
-public typealias OutputStream = TextOutputStream
-
 extension TextOutputStream {
   public mutating func _lock() {}
   public mutating func _unlock() {}

Original file line number	Diff line number	Diff line change
`@@ -73,9 +73,6 @@ public protocol TextOutputStream {`
`73`	`73`	`mutating func write(_ string: String)`
`74`	`74`	`}`
`75`	`75`
`76`		`-/// Temporary typealias`
`77`		`-public typealias OutputStream = TextOutputStream`
`78`		`-`
`79`	`76`	`extension TextOutputStream {`
`80`	`77`	`public mutating func _lock() {}`
`81`	`78`	`public mutating func _unlock() {}`