Skip to content

Commit 95cc595

Browse files
artemcmartemcm
committed
Remove remaining appearences of deprecated 'AbsolutePath' initializer in tests
1 parent c458271 commit 95cc595

14 files changed

+276
-260
lines changed

‎Sources/SwiftDriver/IncrementalCompilation/FirstWaveComputer.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ extension IncrementalCompilationState.FirstWaveComputer {
188188
let invalidateOutOfDate = { (modulesRequiringRebuild: inout Set<ModuleDependencyId>) in
189189
reporter?.reportExplicitDependencyWillBeReBuilt(moduleId.moduleNameForDiagnostic, reason: "Out-of-date")
190190
modulesRequiringRebuild.insert(moduleId)
191-
try invalidatePath(&modulesRequiringRebuild)
191+
invalidatePath(&modulesRequiringRebuild)
192192
}
193193

194194
// Visit the module's dependencies
@@ -202,10 +202,10 @@ extension IncrementalCompilationState.FirstWaveComputer {
202202
}
203203

204204
if modulesRequiringRebuild.contains(moduleId) {
205-
try invalidatePath(&modulesRequiringRebuild)
205+
invalidatePath(&modulesRequiringRebuild)
206206
} else if try !IncrementalCompilationState.IncrementalDependencyAndInputSetup.verifyModuleDependencyUpToDate(moduleID: moduleId, moduleInfo: moduleInfo,
207207
fileSystem: fileSystem, reporter: reporter) {
208-
try invalidateOutOfDate(&modulesRequiringRebuild)
208+
invalidateOutOfDate(&modulesRequiringRebuild)
209209
} else {
210210
// Only if this module is known to be up-to-date with respect to its inputs
211211
// and dependencies do we mark it as visited. We may need to re-visit

‎Sources/SwiftDriver/Jobs/FrontendJobHelpers.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ extension Driver {
138138
if let value = parsedOptions.getLastArgument(rootArg)?.asSingle,
139139
isFrontendArgSupported(rootArg) {
140140
commandLine.appendFlag(rootArg.spelling)
141-
commandLine.appendPath(.init(value))
141+
commandLine.appendPath(try .init(validating: value))
142142
}
143143

144144
if let value = parsedOptions.getLastArgument(versionArg)?.asSingle,

‎Sources/swift-build-sdk-interfaces/main.swift‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,8 @@ do {
8383
// append the SDK version number so all modules will built into
8484
// the SDK-versioned sub-directory.
8585
if outputDir.basename == "prebuilt-modules" {
86-
outputDir = try AbsolutePath(validating: collector.versionString, relativeTo: outputDir)
86+
outputDir = try AbsolutePath(validating: collector.versionString,
87+
relativeTo: outputDir)
8788
}
8889
if !localFileSystem.exists(outputDir) {
8990
try localFileSystem.createDirectory(outputDir, recursive: true)
@@ -100,10 +101,10 @@ do {
100101
} else {
101102
swiftcPath = try AbsolutePath(validating: "Toolchains/XcodeDefault.xctoolchain/usr/bin/swiftc",
102103
relativeTo: sdkPath.parentDirectory
103-
.parentDirectory
104-
.parentDirectory
105-
.parentDirectory
106-
.parentDirectory)
104+
.parentDirectory
105+
.parentDirectory
106+
.parentDirectory
107+
.parentDirectory)
107108
}
108109
if !localFileSystem.exists(swiftcPath) {
109110
diagnosticsEngine.emit(error: "cannot find swift compiler: \(swiftcPath.pathString)")

‎Tests/SwiftDriverTests/APIDigesterTests.swift‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ class APIDigesterTests: XCTestCase {
112112
"-output-file-map", ofmPath.pathString,
113113
])
114114
let digesterJob = try XCTUnwrap(driver.planBuild().first { $0.kind == .generateABIBaseline })
115-
XCTAssertTrue(digesterJob.commandLine.contains(subsequence: ["-o", .path(.absolute(.init("/path/to/baseline.abi.json")))]))
115+
try XCTAssertTrue(digesterJob.commandLine.contains(subsequence: ["-o", .path(.absolute(.init(validating: "/path/to/baseline.abi.json")))]))
116116
}
117117
}
118118
do {
@@ -136,7 +136,7 @@ class APIDigesterTests: XCTestCase {
136136
"-output-file-map", ofmPath.pathString,
137137
])
138138
let digesterJob = try XCTUnwrap(driver.planBuild().first { $0.kind == .generateABIBaseline })
139-
XCTAssertTrue(digesterJob.commandLine.contains(subsequence: ["-o", .path(.absolute(.init("/path/to/sourceinfo.abi.json")))]))
139+
try XCTAssertTrue(digesterJob.commandLine.contains(subsequence: ["-o", .path(.absolute(.init(validating: "/path/to/sourceinfo.abi.json")))]))
140140
}
141141
}
142142
}
@@ -149,8 +149,8 @@ class APIDigesterTests: XCTestCase {
149149
XCTAssertTrue(digesterJob.commandLine.contains("-dump-sdk"))
150150
XCTAssertTrue(digesterJob.commandLine.contains(subsequence: ["-module", "foo"]))
151151
XCTAssertTrue(digesterJob.commandLine.contains(subsequence: ["-I", .path(.relative(.init(".")))]))
152-
XCTAssertTrue(digesterJob.commandLine.contains(subsequence: ["-sdk", .path(.absolute(.init("/path/to/sdk")))]))
153-
XCTAssertTrue(digesterJob.commandLine.contains(subsequence: ["-I", .path(.absolute(.init("/some/path")))]))
152+
try XCTAssertTrue(digesterJob.commandLine.contains(subsequence: ["-sdk", .path(.absolute(.init(validating: "/path/to/sdk")))]))
153+
try XCTAssertTrue(digesterJob.commandLine.contains(subsequence: ["-I", .path(.absolute(.init(validating: "/some/path")))]))
154154
XCTAssertTrue(digesterJob.commandLine.contains(subsequence: ["-F", .path(.relative(.init("framework/path")))]))
155155
XCTAssertTrue(digesterJob.commandLine.contains(subsequence: ["-o", .path(.relative(.init("foo.api.json")))]))
156156

@@ -165,8 +165,8 @@ class APIDigesterTests: XCTestCase {
165165
XCTAssertTrue(digesterJob.commandLine.contains("-dump-sdk"))
166166
XCTAssertTrue(digesterJob.commandLine.contains(subsequence: ["-module", "foo"]))
167167
XCTAssertTrue(digesterJob.commandLine.contains(subsequence: ["-I", .path(.relative(.init(".")))]))
168-
XCTAssertTrue(digesterJob.commandLine.contains(subsequence: ["-sdk", .path(.absolute(.init("/path/to/sdk")))]))
169-
XCTAssertTrue(digesterJob.commandLine.contains(subsequence: ["-I", .path(.absolute(.init("/some/path")))]))
168+
try XCTAssertTrue(digesterJob.commandLine.contains(subsequence: ["-sdk", .path(.absolute(.init(validating: "/path/to/sdk")))]))
169+
try XCTAssertTrue(digesterJob.commandLine.contains(subsequence: ["-I", .path(.absolute(.init(validating: "/some/path")))]))
170170
XCTAssertTrue(digesterJob.commandLine.contains(subsequence: ["-F", .path(.relative(.init("framework/path")))]))
171171
XCTAssertTrue(digesterJob.commandLine.contains(subsequence: ["-o", .path(.relative(.init("foo.abi.json")))]))
172172

@@ -238,10 +238,10 @@ class APIDigesterTests: XCTestCase {
238238
let digesterJob = try XCTUnwrap(driver.planBuild().first { $0.kind == .compareAPIBaseline })
239239
XCTAssertTrue(digesterJob.commandLine.contains("-diagnose-sdk"))
240240
XCTAssertTrue(digesterJob.commandLine.contains(subsequence: ["-module", "foo"]))
241-
XCTAssertTrue(digesterJob.commandLine.contains(subsequence: ["-baseline-path", .path(.absolute(.init("/baseline/path")))]))
241+
try XCTAssertTrue(digesterJob.commandLine.contains(subsequence: ["-baseline-path", .path(.absolute(.init(validating: "/baseline/path")))]))
242242
XCTAssertTrue(digesterJob.commandLine.contains(subsequence: ["-I", .path(.relative(.init(".")))]))
243-
XCTAssertTrue(digesterJob.commandLine.contains(subsequence: ["-sdk", .path(.absolute(.init("/path/to/sdk")))]))
244-
XCTAssertTrue(digesterJob.commandLine.contains(subsequence: ["-I", .path(.absolute(.init("/some/path")))]))
243+
try XCTAssertTrue(digesterJob.commandLine.contains(subsequence: ["-sdk", .path(.absolute(.init(validating: "/path/to/sdk")))]))
244+
try XCTAssertTrue(digesterJob.commandLine.contains(subsequence: ["-I", .path(.absolute(.init(validating: "/some/path")))]))
245245
XCTAssertTrue(digesterJob.commandLine.contains(subsequence: ["-F", .path(.relative(.init("framework/path")))]))
246246
XCTAssertTrue(digesterJob.commandLine.contains(subsequence: ["-breakage-allowlist-path",
247247
.path(.relative(.init("allowlist/path")))]))
@@ -257,7 +257,7 @@ class APIDigesterTests: XCTestCase {
257257
"-digester-breakage-allowlist-path", "allowlist/path"])
258258
let digesterJob = try XCTUnwrap(driver.planBuild().first { $0.kind == .compareABIBaseline })
259259
XCTAssertTrue(digesterJob.commandLine.contains("-diagnose-sdk"))
260-
XCTAssertTrue(digesterJob.commandLine.contains(subsequence: ["-input-paths", .path(.absolute(.init("/baseline/path")))]))
260+
try XCTAssertTrue(digesterJob.commandLine.contains(subsequence: ["-input-paths", .path(.absolute(.init(validating: "/baseline/path")))]))
261261
XCTAssertTrue(digesterJob.commandLine.contains(subsequence: ["-breakage-allowlist-path",
262262
.path(.relative(.init("allowlist/path")))]))
263263
XCTAssertTrue(digesterJob.commandLine.contains("-abi"))

‎Tests/SwiftDriverTests/CachingBuildTests.swift‎

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,15 @@ import TSCBasic
1616
import XCTest
1717
import TestUtilities
1818

19-
private var testInputsPath: AbsolutePath = {
20-
var root: AbsolutePath = AbsolutePath(#file)
21-
while root.basename != "Tests" {
22-
root = root.parentDirectory
19+
private var testInputsPath: AbsolutePath {
20+
get throws {
21+
var root: AbsolutePath = try AbsolutePath(validating: #file)
22+
while root.basename != "Tests" {
23+
root = root.parentDirectory
24+
}
25+
return root.parentDirectory.appending(component: "TestInputs")
2326
}
24-
return root.parentDirectory.appending(component: "TestInputs")
25-
}()
27+
}
2628

2729
private func checkCachingBuildJob(job: Job,
2830
moduleId: ModuleDependencyId,
@@ -151,14 +153,14 @@ final class CachingBuildTests: XCTestCase {
151153
$0 <<< "import G;"
152154
}
153155
let casPath = path.appending(component: "cas")
156+
let swiftModuleInterfacesPath: AbsolutePath =
157+
try testInputsPath.appending(component: "ExplicitModuleBuilds")
158+
.appending(component: "Swift")
154159
let cHeadersPath: AbsolutePath =
155-
testInputsPath.appending(component: "ExplicitModuleBuilds")
156-
.appending(component: "CHeaders")
160+
try testInputsPath.appending(component: "ExplicitModuleBuilds")
161+
.appending(component: "CHeaders")
157162
let bridgingHeaderpath: AbsolutePath =
158163
cHeadersPath.appending(component: "Bridging.h")
159-
let swiftModuleInterfacesPath: AbsolutePath =
160-
testInputsPath.appending(component: "ExplicitModuleBuilds")
161-
.appending(component: "Swift")
162164
let sdkArgumentsForTesting = (try? Driver.sdkArgumentsForTesting()) ?? []
163165
var driver = try Driver(args: ["swiftc",
164166
"-target", "x86_64-apple-macosx11.0",
@@ -282,11 +284,11 @@ final class CachingBuildTests: XCTestCase {
282284
}
283285

284286
let swiftModuleInterfacesPath: AbsolutePath =
285-
testInputsPath.appending(component: "ExplicitModuleBuilds")
286-
.appending(component: "Swift")
287+
try testInputsPath.appending(component: "ExplicitModuleBuilds")
288+
.appending(component: "Swift")
287289
let cHeadersPath: AbsolutePath =
288-
testInputsPath.appending(component: "ExplicitModuleBuilds")
289-
.appending(component: "CHeaders")
290+
try testInputsPath.appending(component: "ExplicitModuleBuilds")
291+
.appending(component: "CHeaders")
290292
let casPath = path.appending(component: "cas")
291293
let swiftInterfacePath: AbsolutePath = path.appending(component: "testExplicitModuleVerifyInterfaceJobs.swiftinterface")
292294
let privateSwiftInterfacePath: AbsolutePath = path.appending(component: "testExplicitModuleVerifyInterfaceJobs.private.swiftinterface")
@@ -431,11 +433,11 @@ final class CachingBuildTests: XCTestCase {
431433
}
432434

433435
let cHeadersPath: AbsolutePath =
434-
testInputsPath.appending(component: "ExplicitModuleBuilds")
435-
.appending(component: "CHeaders")
436+
try testInputsPath.appending(component: "ExplicitModuleBuilds")
437+
.appending(component: "CHeaders")
436438
let swiftModuleInterfacesPath: AbsolutePath =
437-
testInputsPath.appending(component: "ExplicitModuleBuilds")
438-
.appending(component: "Swift")
439+
try testInputsPath.appending(component: "ExplicitModuleBuilds")
440+
.appending(component: "Swift")
439441
let sdkArgumentsForTesting = (try? Driver.sdkArgumentsForTesting()) ?? []
440442
var driver = try Driver(args: ["swiftc",
441443
"-I", cHeadersPath.nativePathString(escaped: true),
@@ -550,11 +552,11 @@ final class CachingBuildTests: XCTestCase {
550552
}
551553

552554
let cHeadersPath: AbsolutePath =
553-
testInputsPath.appending(component: "ExplicitModuleBuilds")
554-
.appending(component: "CHeaders")
555+
try testInputsPath.appending(component: "ExplicitModuleBuilds")
556+
.appending(component: "CHeaders")
555557
let swiftModuleInterfacesPath: AbsolutePath =
556-
testInputsPath.appending(component: "ExplicitModuleBuilds")
557-
.appending(component: "Swift")
558+
try testInputsPath.appending(component: "ExplicitModuleBuilds")
559+
.appending(component: "Swift")
558560
let casPath = path.appending(component: "cas")
559561
let sdkArgumentsForTesting = (try? Driver.sdkArgumentsForTesting()) ?? []
560562
var driver = try Driver(args: ["swiftc",

‎Tests/SwiftDriverTests/DependencyGraphSerializationTests.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class DependencyGraphSerializationTests: XCTestCase, ModuleDependencyGraphMocker
2222
///
2323
/// Ensure that a round-trip fails when the minor version number changes
2424
func testSerializedVersionChangeDetection() throws {
25-
let mockPath = try VirtualPath.absolute(AbsolutePath(validating: "/module-dependency-graph"))
25+
let mockPath = VirtualPath.absolute(try AbsolutePath(validating: "/module-dependency-graph"))
2626
let fs = InMemoryFileSystem()
2727
let graph = Self.mockGraphCreator.mockUpAGraph()
2828
let currentVersion = ModuleDependencyGraph.serializedGraphVersion
@@ -55,7 +55,7 @@ class DependencyGraphSerializationTests: XCTestCase, ModuleDependencyGraphMocker
5555
}
5656

5757
func roundTrip(_ originalGraph: ModuleDependencyGraph) throws {
58-
let mockPath = try VirtualPath.absolute(AbsolutePath(validating: "/module-dependency-graph"))
58+
let mockPath = VirtualPath.absolute(try AbsolutePath(validating: "/module-dependency-graph"))
5959
let fs = InMemoryFileSystem()
6060
let outputFileMap = OutputFileMap.mock(maxIndex: Self.maxIndex)
6161

0 commit comments

Comments
 (0)