fix build after #242

Sources/Build/describe().swift

@@ -62,7 +62,7 @@ public func describe(_ prefix: String, _ conf: Configuration, _ modules: [Module
         targets.append(command, for: product)
     }
 
-    return try write(path: "\(prefix).yaml") { writeln in
+    return try write("\(prefix).yaml") { writeln in
         writeln("client:")
         writeln("  name: swift-build")
         writeln("tools: {}")

Sources/Get/Fetcher.swift

@@ -73,7 +73,7 @@ extension Fetcher {
                         return []
                     }
 
-                } else if let pkg = try self.find(url: url) {
+                } else if let pkg = try self.find(url) {
 
                     // this package was already installed from a previous instantiation
                     // of the package manager. Verify it is within the required version
@@ -89,7 +89,7 @@ extension Fetcher {
 
                     // clone the package
 
-                    let clone = try self.fetch(url: url)
+                    let clone = try self.fetch(url)
                     try adjust(clone, specifiedVersionRange)
                     graph[url] = (clone, specifiedVersionRange)
                     return try recurse(clone.children) + [url]

Sources/Get/PackagesDirectory.swift

@@ -34,7 +34,7 @@ extension PackagesDirectory: Fetcher {
         for prefix in walk(self.prefix, recursively: false) {
             guard let repo = Git.Repo(path: prefix) else { continue }  //TODO warn user
             guard repo.origin == url else { continue }
-            return try Package.make(repo: repo, manifestParser: manifestParser)
+            return try Package.make(repo, manifestParser: manifestParser)
         }
         return nil
     }
@@ -57,9 +57,9 @@ extension PackagesDirectory: Fetcher {
         case let clone as RawClone:
             let prefix = Path.join(self.prefix, clone.finalName)
             try mkdir(prefix.parentDirectory)
-            try rename(old: clone.path, new: prefix)
+            try rename(clone.path, new: prefix)
             //TODO don't reparse the manifest!
-            return try Package.make(repo: Git.Repo(path: prefix)!, manifestParser: manifestParser)!
+            return try Package.make(Git.Repo(path: prefix)!, manifestParser: manifestParser)!
         case let pkg as Package:
             return pkg
         default:

Sources/ManifestParser/fromTOML().swift

@@ -81,7 +81,7 @@ extension PackageDescription.Package.Dependency {
             }
         }
 
-        return PackageDescription.Package.Dependency.Package(url: fixURL(), versions: v1..<v2)
+        return PackageDescription.Package.Dependency.Package(fixURL(), versions: v1..<v2)
     }
 }
 

Sources/Multitool/Error.swift

@@ -84,7 +84,7 @@ private func red(_ input: Any) -> String {
     return CSI + "31m" + input + CSI + "0m"
 }
 
-private func print(error: Any) {
+private func print(error error: Any) {
     if !isatty(fileno(libc.stderr)) {
         let cmd = Process.arguments.first?.basename ?? "SwiftPM"
         print("\(cmd): error:", error, to: &stderr)

Sources/PackageType/Module.swift

@@ -40,7 +40,7 @@ public class Module: ModuleProtocol {
     }
 
     public var c99name: String {
-        return PackageType.c99name(name: name)
+        return PackageType.c99name(name)
     }
 }
 
@@ -138,7 +138,7 @@ public class TestModule: SwiftModule {
     }
 
     override public var c99name: String {
-        return PackageType.c99name(name: basename) + "TestSuite"
+        return PackageType.c99name(basename) + "TestSuite"
     }
 }
 

Sources/Xcodeproj/generate().swift

@@ -25,13 +25,13 @@ public func generate(dstdir: String, projectName: String, srcroot: String, modul
 
 ////// the pbxproj file describes the project and its targets
     try open(xcodeprojPath, "project.pbxproj") { fwrite in
-        pbxproj(srcroot: srcroot, projectRoot: dstdir, modules: modules, externalModules: externalModules, products: products, printer: fwrite)
+        pbxproj(srcroot, projectRoot: dstdir, modules: modules, externalModules: externalModules, products: products, printer: fwrite)
     }
 
 ////// the scheme acts like an aggregate target for all our targets
    /// it has all tests associated so CMD+U works
     try open(schemesDirectory, schemeName) { fwrite in
-        xcscheme(container: xcodeprojName, modules: modules, printer: fwrite)
+        xcscheme(xcodeprojName, modules: modules, printer: fwrite)
     }
 
 ////// we generate this file to ensure our main scheme is listed

Sources/swift-build/initPackage.swift

@@ -102,8 +102,8 @@ final class InitPackage {
         try mkdir(tests)
         ///Only libraries are testable for now
         if mode == .Library {
-            try writeLinuxMain(testsPath: tests)
-            try writeTestFileStubs(testsPath: tests)
+            try writeLinuxMain(tests)
+            try writeTestFileStubs(tests)
         }
     }
 

Sources/swift-build/main.swift

@@ -54,7 +54,7 @@ do {
     }
 
     func fetch(_ root: String) throws -> (rootPackage: Package, externalPackages:[Package]) {
-        let manifest = try parseManifest(path: root, baseURL: root)
+        let manifest = try parseManifest(root, baseURL: root)
         return try get(manifest, manifestParser: parseManifest)
     }
 
@@ -64,7 +64,7 @@ do {
             let (rootPackage, externalPackages) = try fetch(dirs.root)
             let (modules, externalModules, products) = try transmute(rootPackage, externalPackages: externalPackages)
             let yaml = try describe(dirs.build, conf, modules, Set(externalModules), products, Xcc: opts.Xcc, Xld: opts.Xld, Xswiftc: opts.Xswiftc, toolchain: toolchain)
-            try build(YAMLPath: yaml, target: "default")
+            try build(yaml, target: "default")
 
         case .Init(let initMode):
             let initPackage = InitPackage(mode: initMode)
@@ -110,7 +110,7 @@ do {
                 projectName = packageName
             }
 
-            let outpath = try Xcodeproj.generate(dstdir: dstdir, projectName: projectName, srcroot: dirs.root, modules: xcodeModules, externalModules: externalXcodeModules, products: products)
+            let outpath = try Xcodeproj.generate(dstdir, projectName: projectName, srcroot: dirs.root, modules: xcodeModules, externalModules: externalXcodeModules, products: products)
 
             print("generated:", outpath.prettied)
     }

Sources/swift-build/usage.swift

@@ -120,7 +120,7 @@ struct Options {
 func parse(commandLineArguments args: [String]) throws -> (Mode, Options) {
     let mode: Mode?
     let flags: [Flag]
-    (mode, flags) = try parse(arguments: args)
+    (mode, flags) = try parse(args)
 
     var opts = Options()
     for flag in flags {

Sources/swift-test/main.swift

@@ -48,8 +48,8 @@ do {
         }
 
         let yamlPath = Path.join(dir.build, "\(configuration).yaml")
-        try build(YAMLPath: yamlPath, target: "test")
-        let success = try test(path: determineTestPath(), xctestArg: specifier)
+        try build(yamlPath, target: "test")
+        let success = try test(determineTestPath(), xctestArg: specifier)
         exit(success ? 0 : 1)
     }
 } catch Multitool.Error.BuildYAMLNotFound {

Sources/swift-test/usage.swift

@@ -72,7 +72,7 @@ struct Options {
 func parse(commandLineArguments args: [String]) throws -> (Mode, Options) {
     let mode: Mode?
     let flags: [Flag]
-    (mode, flags) = try parse(arguments: args)
+    (mode, flags) = try parse(args)
 
     var opts = Options()
     for flag in flags {

Tests/Xcodeproj/TestGeneration.swift

@@ -51,7 +51,7 @@ class TestGeneration: XCTestCase {
             let modules = dummy()
             let products: [Product] = []
 
-            let outpath = try Xcodeproj.generate(dstdir: dstdir, projectName: projectName, srcroot: srcroot, modules: modules, externalModules: [], products: products)
+            let outpath = try Xcodeproj.generate(dstdir, projectName: projectName, srcroot: srcroot, modules: modules, externalModules: [], products: products)
 
             XCTAssertDirectoryExists(outpath)
             XCTAssertEqual(outpath, Path.join(dstdir, "\(projectName).xcodeproj"))