Fixup several warnings

- Remove unnecessary `try` statements for function calls that do not
  throw
- Remove unnecessary `#expect` checks for values that cannot be `nil`

Author: plemarquand

Sources/Commands/Utilities/PluginDelegate.swift

@@ -423,8 +423,8 @@ final class PluginDelegate: PluginInvocationDelegate {
             func lookupDescription(
                 for moduleName: String,
                 destination: BuildParameters.Destination
-            ) throws -> ModuleBuildDescription? {
-                try buildPlan.buildModules.first {
+            ) -> ModuleBuildDescription? {
+                buildPlan.buildModules.first {
                     $0.module.name == moduleName && $0.buildParameters.destination == destination
                 }
             }
@@ -434,9 +434,9 @@ final class PluginDelegate: PluginInvocationDelegate {
             // historically how this was setup. Ideally we should be building for both "host"
             // and "target" if module is configured for them but that would require changing
             // `PluginInvocationSymbolGraphResult` to carry multiple directories.
-            let description = if let targetDescription = try lookupDescription(for: targetName, destination: .target) {
+            let description = if let targetDescription = lookupDescription(for: targetName, destination: .target) {
                 targetDescription
-            } else if let hostDescription = try lookupDescription(for: targetName, destination: .host) {
+            } else if let hostDescription = lookupDescription(for: targetName, destination: .host) {
                 hostDescription
             } else {
                 throw InternalError("could not find a target named: \(targetName)")

Tests/FunctionalTests/PluginTests.swift

@@ -778,8 +778,8 @@ final class PluginTests {
             ) async throws {
                 // Find the named plugin.
                 let plugins = package.modules.compactMap{ $0.underlying as? PluginModule }
-                let plugin = try #require(plugins.first(where: { $0.name == pluginName }), "There is no plugin target named ‘\(pluginName)’")
-                try #require(plugin.type == .plugin, "Target \(plugin) isn’t a plugin")
+                let plugin = #require(plugins.first(where: { $0.name == pluginName }), "There is no plugin target named ‘\(pluginName)’")
+                #require(plugin.type == .plugin, "Target \(plugin) isn’t a plugin")
 
                 // Find the named input targets to the plugin.
                 var modules: [ResolvedModule] = []

Tests/FunctionalTests/StaticBinaryLibrary.swift

@@ -24,7 +24,7 @@ struct StaticBinaryLibraryTests {
 
         try await withKnownIssue {
             try await fixture(name: "BinaryLibraries") { fixturePath in
-                let (stdout, stderr) = try await executeSwiftRun(
+                let (stdout, _) = try await executeSwiftRun(
                     fixturePath.appending("Static").appending("Package1"),
                     "Example",
                     extraArgs: ["--experimental-prune-unused-dependencies"],

Tests/IntegrationTests/SwiftPMTests.swift

@@ -20,7 +20,7 @@ import struct SPMBuildCore.BuildSystemProvider
 private struct SwiftPMTests {
     @Test(.requireHostOS(.macOS))
     func binaryTargets() async throws {
-        try await withKnownIssue("error: the path does not point to a valid framework:") {
+        await withKnownIssue("error: the path does not point to a valid framework:") {
             try await binaryTargetsFixture { fixturePath in
                 do {
                     await withKnownIssue("error: local binary target ... does not contain a binary artifact") {

Tests/PackageGraphTests/ModulesGraphTests.swift

@@ -2283,7 +2283,7 @@ struct ModulesGraphTests {
         let observability = try loadUnsafeModulesGraph(toolsVersion: .v6_1)
 
         #expect(observability.diagnostics.count == 3)
-        try testDiagnostics(observability.diagnostics) { result in
+        testDiagnostics(observability.diagnostics) { result in
             var expectedMetadata = ObservabilityMetadata()
             expectedMetadata.moduleName = "Foo2"
             let diagnostic1 = try #require(result.checkUnordered(

Tests/PackageSigningTests/SigningTests.swift

@@ -786,10 +786,8 @@ struct SigningTests {
             return
         }
         switch signingEntity {
-        case .recognized(_, let name, let organizationalUnit, let organization):
-            #expect(name != nil)
-            #expect(organizationalUnit != nil)
-            #expect(organization != nil)
+        case .recognized:
+            break
         case .unrecognized(let name, let organizationalUnit, let organization):
             #expect(name != nil)
             #expect(organizationalUnit != nil)
@@ -841,10 +839,8 @@ struct SigningTests {
             return
         }
         switch signingEntity {
-        case .recognized(_, let name, let organizationalUnit, let organization):
-            #expect(name != nil)
-            #expect(organizationalUnit != nil)
-            #expect(organization != nil)
+        case .recognized:
+            break
         case .unrecognized(let name, let organizationalUnit, let organization):
             #expect(name != nil)
             #expect(organizationalUnit != nil)
@@ -896,10 +892,8 @@ struct SigningTests {
             return
         }
         switch signingEntity {
-        case .recognized(_, let name, let organizationalUnit, let organization):
-            #expect(name != nil)
-            #expect(organizationalUnit != nil)
-            #expect(organization != nil)
+        case .recognized:
+            break
         case .unrecognized(let name, let organizationalUnit, let organization):
             #expect(name != nil)
             #expect(organizationalUnit != nil)

Tests/WorkspaceTests/ToolsVersionSpecificationRewriterTests.swift

@@ -120,7 +120,7 @@ fileprivate struct ToolsVersionSpecificationRewriterTests {
         )
 
         // resultHandler(try inMemoryFileSystem.readFileContents(manifestFilePath))
-        let actual = try #require(try inMemoryFileSystem.readFileContents(manifestFilePath))
+        let actual = try inMemoryFileSystem.readFileContents(manifestFilePath)
         #expect(actual.validDescription == expected, "Actual is not expected")
     }