Fixup several warnings #9009

plemarquand · 2025-08-11T14:10:04Z

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

plemarquand · 2025-08-11T15:03:39Z

@swift-ci test

plemarquand · 2025-08-12T20:08:19Z

@swift-ci test

plemarquand · 2025-08-13T17:47:00Z

@swift-ci test

dschaefer2 · 2025-08-13T18:40:53Z

@swift-ci please test windows

bkhouri

Thanks for the cleanup. I have some comments, which some possibly being blocking.

Sources/_InternalTestSupport/GitRepositoryExtensions.swift

Sources/_InternalTestSupport/misc.swift

Tests/CommandsTests/PackageCommandTests.swift

Tests/FunctionalTests/MiscellaneousTests.swift

bkhouri · 2025-08-13T22:05:21Z

Tests/FunctionalTests/MiscellaneousTests.swift

@@ -721,7 +721,7 @@ final class MiscellaneousTestCase: XCTestCase {
                guard case SwiftPMError.executionFailure(_, _, let stderr) = error else {
                    return XCTFail("invalid error \(error)")
                }
-                XCTAssert(stderr.contains("error: You don’t have permission"), "expected permissions error. stderr: '\(stderr)'")
+                XCTAssert(stderr.contains("error: You don’t have permission") || stderr.contains("invalid access"), "expected permissions error. stderr: '\(stderr)'")


issue (possibly-blocking): I this is also update a test case. do we know if this new expectation is expected, or whether it's a regression?

This change is unrelated to my patch, but its because this test is failing on main. I had to fix it to get CI to pass. To verify, make sure you do a swift package update first.

I understand it's failing on main, but could this mean a regression was introduced somewhere? That is, test is there for a reason and may have actually served its purpose.

I wasn't able to track down what specifically caused this to change, but this failure stems from the underlying API moving from the Foundation based file system APIs to the tools-support-core FileSystem.

It would be ideal to understand the root cause and determine whether the is the expected behaviour or a regression, instead of simply updating the test to reflect the current behaviour - which may be a regression.

Its likely this change: https://github.com/swiftlang/swift-tools-support-core/pull/521/files#diff-4a8cbeddae09f50e3bf71a7b4f098244ee50dad510e6359a24f2678a5bca10d5R506, converting the NSError's produced inside various FileSystem functions into FileSystemErrors.

Tests/FunctionalTests/MiscellaneousTests.swift

bkhouri · 2025-08-13T22:21:26Z

@swift-ci test self hosted

bkhouri · 2025-08-14T16:14:12Z

The previous self hosted windows has the following set failures, which appear unrelated to this change

20:21:10  Test Suite 'AsyncProcessTests' started at 2025-08-13 22:52:42.545
20:21:10  Test Case 'AsyncProcessTests.testPopenWithBufferLargerThanAllocated' started at 2025-08-13 22:52:42.546
20:21:10  <EXPR>:0: error: AsyncProcessTests.testPopenWithBufferLargerThanAllocated : threw error "invalid access to C:\Users\ContainerAdministrator\AppData\Local\Temp\TemporaryFile.BADQz2"
20:21:10  Test Case 'AsyncProcessTests.testPopenWithBufferLargerThanAllocated' failed (0.014 seconds)
20:21:10  Test Suite 'AsyncProcessTests' failed at 2025-08-13 22:52:42.560
20:21:10  	 Executed 1 test, with 1 failure (1 unexpected) in 0.014 (0.014) seconds
20:21:10  Test Suite 'Selected tests' failed at 2025-08-13 22:52:42.560
20:21:10  	 Executed 1 test, with 1 failure (1 unexpected) in 0.014 (0.014) seconds
20:21:10  
20:21:10  Test Suite 'Selected tests' started at 2025-08-13 22:54:31.661
20:21:10  Test Suite 'SwiftSDKCommandTests' started at 2025-08-13 22:54:31.664
20:21:10  Test Case 'SwiftSDKCommandTests.testConfigureSubcommand' started at 2025-08-13 22:54:31.664
20:21:10  C:\source\swiftpm\Tests\CommandsTests\SwiftSDKCommandTests.swift:151: error: SwiftSDKCommandTests.testConfigureSubcommand : XCTAssertTrue failed - unexpected failure matching '' against pattern contains("test-sdk.artifactbundle.zip` successfully installed as test-sdk.artifactbundle.")
20:21:10  Test Case 'SwiftSDKCommandTests.testConfigureSubcommand' failed (33.06 seconds)
20:21:10  Test Suite 'SwiftSDKCommandTests' failed at 2025-08-13 22:55:04.724
20:21:10  	 Executed 1 test, with 1 failure (0 unexpected) in 33.06 (33.06) seconds
20:21:10  Test Suite 'Selected tests' failed at 2025-08-13 22:55:04.724
20:21:10  	 Executed 1 test, with 1 failure (0 unexpected) in 33.06 (33.06) seconds

I'm re-triggering build.

@swift-ci test self hosted windows

plemarquand · 2025-08-14T17:16:59Z

@swift-ci test

bkhouri · 2025-08-14T17:22:07Z

@swift-ci test windows

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

plemarquand · 2025-08-17T14:44:45Z

@swift-ci test

plemarquand · 2025-08-17T23:07:15Z

@swift-ci please test macOS

plemarquand · 2025-08-17T23:07:20Z

@swift-ci please test windows

plemarquand · 2025-08-19T14:38:40Z

@swift-ci please test macOS

bkhouri · 2025-08-20T14:32:25Z

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


issue: Since this suite is SwiftTesting, we should be using expectDiagnostics instead of testDiagnostics

This should probably be handled in a subsequent change

plemarquand requested review from jakepetroules, dschaefer2, shawnhyam, bripeticca, owenv, bkhouri, cmcgee1024 and daveyc123 as code owners August 11, 2025 14:10

plemarquand force-pushed the fixup-warnings branch from 6625710 to df13ad4 Compare August 11, 2025 15:03

jakepetroules approved these changes Aug 11, 2025

View reviewed changes

plemarquand force-pushed the fixup-warnings branch from 3e6cd06 to 4855cdd Compare August 12, 2025 20:07

dschaefer2 approved these changes Aug 13, 2025

View reviewed changes

bkhouri reviewed Aug 13, 2025

View reviewed changes

plemarquand added 3 commits August 17, 2025 10:13

Fixup several warnings

0d892ad

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

Move off deprecated function

0b2b787

Address comments

3bacce0

plemarquand force-pushed the fixup-warnings branch from 2b57abc to 3bacce0 Compare August 17, 2025 14:19

plemarquand requested a review from bkhouri August 20, 2025 02:23

bkhouri approved these changes Aug 20, 2025

View reviewed changes

plemarquand merged commit 9e6c764 into swiftlang:main Aug 20, 2025
6 checks passed

Fixup several warnings #9009

Fixup several warnings #9009

Uh oh!

Conversation

plemarquand commented Aug 11, 2025

Uh oh!

plemarquand commented Aug 11, 2025

Uh oh!

plemarquand commented Aug 12, 2025

Uh oh!

plemarquand commented Aug 13, 2025

Uh oh!

dschaefer2 commented Aug 13, 2025

Uh oh!

bkhouri left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

bkhouri Aug 13, 2025

Choose a reason for hiding this comment

Uh oh!

plemarquand Aug 14, 2025

Choose a reason for hiding this comment

Uh oh!

bkhouri Aug 14, 2025

Choose a reason for hiding this comment

Uh oh!

plemarquand Aug 14, 2025

Choose a reason for hiding this comment

Uh oh!

bkhouri Aug 14, 2025

Choose a reason for hiding this comment

Uh oh!

plemarquand Aug 15, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

bkhouri commented Aug 13, 2025

Uh oh!

bkhouri commented Aug 14, 2025

Uh oh!

plemarquand commented Aug 14, 2025

Uh oh!

bkhouri commented Aug 14, 2025

Uh oh!

plemarquand commented Aug 17, 2025

Uh oh!

plemarquand commented Aug 17, 2025

Uh oh!

plemarquand commented Aug 17, 2025

Uh oh!

plemarquand commented Aug 19, 2025

Uh oh!

bkhouri Aug 20, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

plemarquand Aug 15, 2025 •

edited

Loading