Skip to content

Fix several warnings across the codebase #8743

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 30, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Sources/Workspace/Workspace+Manifests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ extension Workspace {

let inputNodes: [GraphLoadingNode] = try root.packages.map { identity, package in
inputIdentities.append(package.reference)
var traits: Set<String>? = rootEnabledTraitsMap[package.reference.identity] ?? []
let traits: Set<String>? = rootEnabledTraitsMap[package.reference.identity] ?? []

let node = try GraphLoadingNode(
identity: identity,
Expand All @@ -239,7 +239,7 @@ extension Workspace {
let package = dependency.packageRef
inputIdentities.append(package)
return try manifestsMap[dependency.identity].map { manifest in
var traits: Set<String>? = rootDependenciesEnabledTraitsMap[dependency.identity] ?? []
let traits: Set<String>? = rootDependenciesEnabledTraitsMap[dependency.identity] ?? []

return try GraphLoadingNode(
identity: dependency.identity,
Expand Down Expand Up @@ -629,7 +629,7 @@ extension Workspace {
let firstLevelDependencies = try topLevelManifests.values.map { manifest in
try manifest.dependencies.filter { dep in
guard configuration.pruneDependencies else { return true }
var enabledTraits: Set<String>? = root.enabledTraits[manifest.packageIdentity]
let enabledTraits: Set<String>? = root.enabledTraits[manifest.packageIdentity]
let isDepUsed = try manifest.isPackageDependencyUsed(dep, enabledTraits: enabledTraits)
return isDepUsed
}.map(\.packageRef)
Expand Down
6 changes: 3 additions & 3 deletions Tests/BasicsTests/FileSystem/InMemoryFilesSystemTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ struct InMemoryFileSystemTests {

// WHEN we write contents to the file
// THEn we expect an error to occus
try withKnownIssue {
withKnownIssue {
try fs.writeFileContents(pathUnderTest, bytes: expectedContents)
}

Expand All @@ -165,7 +165,7 @@ struct InMemoryFileSystemTests {

// WHEN we write contents to the file
// THEN we expect an error to occur
try withKnownIssue {
withKnownIssue {
try fs.writeFileContents(pathUnderTest, bytes: expectedContents)
}

Expand Down Expand Up @@ -201,7 +201,7 @@ struct InMemoryFileSystemTests {

// WHEN we read a non-existing file
// THEN an error occurs
try withKnownIssue {
withKnownIssue {
let _ = try fs.readFileContents("/file/does/not/exists")
}
}
Expand Down
43 changes: 19 additions & 24 deletions Tests/BasicsTests/TripleTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ struct TripleTests {
],
)
func isAppleIsDarwin(_ tripleName: String, _ isApple: Bool, _ isDarwin: Bool) throws {
let triple = try #require(try Triple(tripleName), "Unknown triple '\(tripleName)'.")
let triple = try Triple(tripleName)
#expect(
isApple == triple.isApple(),
"""
Expand Down Expand Up @@ -160,7 +160,7 @@ struct TripleTests {
func tripleStringForPlatformVersion(
tripleName: String, version: String, expectedTriple: String
) throws {
let triple = try #require(try Triple(tripleName), "Unknown triple '\(tripleName)'.")
let triple = try Triple(tripleName)
let actualTriple = triple.tripleString(forPlatformVersion: version)
#expect(
actualTriple == expectedTriple,
Expand Down Expand Up @@ -252,8 +252,7 @@ struct TripleTests {
func knownTripleParsing(
data: DataKnownTripleParsing,
) throws {
let triple = try #require(
try Triple(data.tripleName), "Unknown triple '\(data.tripleName)'.")
let triple = try Triple(data.tripleName)
#expect(triple.arch == data.expectedArch, "Actual arch not as expected")
#expect(triple.subArch == data.expectedSubArch, "Actual subarch is not as expected")
#expect(triple.vendor == data.expectedVendor, "Actual Vendor is not as expected")
Expand All @@ -263,31 +262,27 @@ struct TripleTests {
}

@Test
func triple() {
let linux = try? Triple("x86_64-unknown-linux-gnu")
#expect(linux != nil)
#expect(linux!.os == .linux)
#expect(linux!.osVersion == Triple.Version.zero)
#expect(linux!.environment == .gnu)
func triple() throws {
let linux = try Triple("x86_64-unknown-linux-gnu")
#expect(linux.os == .linux)
#expect(linux.osVersion == Triple.Version.zero)
#expect(linux.environment == .gnu)

let macos = try? Triple("x86_64-apple-macosx10.15")
#expect(macos! != nil)
#expect(macos!.osVersion == .init(parse: "10.15"))
let macos = try Triple("x86_64-apple-macosx10.15")
#expect(macos.osVersion == .init(parse: "10.15"))
let newVersion = "10.12"
let tripleString = macos!.tripleString(forPlatformVersion: newVersion)
let tripleString = macos.tripleString(forPlatformVersion: newVersion)
#expect(tripleString == "x86_64-apple-macosx10.12")
let macosNoX = try? Triple("x86_64-apple-macos12.2")
#expect(macosNoX! != nil)
#expect(macosNoX!.os == .macosx)
#expect(macosNoX!.osVersion == .init(parse: "12.2"))
let macosNoX = try Triple("x86_64-apple-macos12.2")
#expect(macosNoX.os == .macosx)
#expect(macosNoX.osVersion == .init(parse: "12.2"))

let android = try? Triple("aarch64-unknown-linux-android24")
#expect(android != nil)
#expect(android!.os == .linux)
#expect(android!.environment == .android)
let android = try Triple("aarch64-unknown-linux-android24")
#expect(android.os == .linux)
#expect(android.environment == .android)

let linuxWithABIVersion = try? Triple("x86_64-unknown-linux-gnu42")
#expect(linuxWithABIVersion!.environment == .gnu)
let linuxWithABIVersion = try Triple("x86_64-unknown-linux-gnu42")
#expect(linuxWithABIVersion.environment == .gnu)
}

@Test
Expand Down
2 changes: 0 additions & 2 deletions Tests/WorkspaceTests/WorkspaceTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -3886,8 +3886,6 @@ final class WorkspaceTests: XCTestCase {
}

func testResolvedFileSchemeToolsVersion() async throws {
let fs = InMemoryFileSystem()

for pair in [
(ToolsVersion.v5_2, ToolsVersion.v5_2),
(ToolsVersion.v5_6, ToolsVersion.v5_6),
Expand Down