Merge pull request #617 from itaiferber/pr-foundation-3.0-integration

[DO NOT MERGE YET] Cherry-pick commits required for swift-3.0-branch Foundation integration

Author: tkremenek

Sources/Basic/Condition.swift

@@ -10,11 +10,6 @@
 
 import Foundation
 
-// FIXME: Temporary compatibility shims.
-#if !os(macOS)
-private typealias NSCondition = Foundation.Condition
-#endif
-
 /// A simple condition wrapper.
 public struct Condition {
     private let _condition = NSCondition()

Sources/Basic/Lock.swift

@@ -10,11 +10,6 @@
 
 import Foundation
 
-// FIXME: Temporary compatibility shims.
-#if !os(macOS)
-private typealias NSLock = Foundation.Lock
-#endif
-
 /// A simple lock wrapper.
 public struct Lock {
     private var _lock = NSLock()

Sources/Basic/Thread.swift

@@ -47,7 +47,7 @@ final public class Thread {
             }
         }
 
-        self.thread = ThreadImpl(theTask)
+        self.thread = ThreadImpl(block: theTask)
     }
 
     /// Starts the thread execution.
@@ -76,7 +76,7 @@ final private class ThreadImpl: Foundation.Thread {
         task()
     }
 
-    init(_ task: @escaping () -> Void) {
+    init(block task: @escaping () -> Void) {
         self.task = task
     }
 }

Sources/Commands/SwiftTestTool.swift

@@ -291,11 +291,7 @@ public struct SwiftTestTool: SwiftTool {
 
         // Execute the XCTest with inherited environment as it is convenient to pass senstive
         // information like username, password etc to test cases via enviornment variables.
-      #if os(Linux)
-        let result: Void? = try? system(args, environment: ProcessInfo.processInfo().environment)
-      #else
         let result: Void? = try? system(args, environment: ProcessInfo.processInfo.environment)
-      #endif
         return result != nil
     }
 

Sources/Get/Git.swift

@@ -25,11 +25,7 @@ extension Git {
         }
 
         do {
-          #if os(Linux)
-            let env = ProcessInfo.processInfo().environment
-          #else
             let env = ProcessInfo.processInfo.environment
-          #endif
             try system(Git.tool, "clone",
                        "--recursive",   // get submodules too so that developers can use these if they so choose
                 "--depth", "10",

Sources/SourceControl/GitRepository.swift

@@ -47,11 +47,7 @@ public class GitRepositoryProvider: RepositoryProvider {
         do {
             // FIXME: We need infrastructure in this subsystem for reporting
             // status information.
-          #if os(Linux)
-            let env = ProcessInfo.processInfo().environment
-          #else
             let env = ProcessInfo.processInfo.environment
-          #endif
             try system(
                 Git.tool, "clone", "--bare", repository.url, path.asString,
                 environment: env, message: "Cloning \(repository.url)")

Sources/Utility/Git.swift

@@ -121,11 +121,7 @@ public class Git {
         }
 
         public func fetch() throws {
-#if os(Linux)
-            try system(Git.tool, "-C", path.asString, "fetch", "--tags", "origin", environment: ProcessInfo.processInfo().environment, message: nil)
-#else
             try system(Git.tool, "-C", path.asString, "fetch", "--tags", "origin", environment: ProcessInfo.processInfo.environment, message: nil)
-#endif
         }
     }