fix: update snapshots and solve merge conflict

Author: Chamepp

.github/workflows/pull_request.yml

@@ -26,6 +26,7 @@ jobs:
     with:
       windows_exclude_swift_versions: "[{\"swift_version\": \"5.9\"}]"
       enable_macos_checks: true
+      macos_exclude_xcode_versions: "[{\"xcode_version\": \"16.0\"}, {\"xcode_version\": \"16.1\"}]"
 
   cmake-build:
     name: CMake Build
@@ -50,6 +51,25 @@ jobs:
       - name: Build
         run: cmake --build .cmake-build
 
+  wasm-build:
+    name: Wasm Build
+    runs-on: ubuntu-latest
+    container:
+      image: swift:6.1-noble
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+      - name: Install Swift SDKs for WebAssembly
+        run: |
+          # TODO: We can replace these Swift SDKs with the swift.org one once it supports Foundation.
+          swift sdk install https://github.com/swiftwasm/swift/releases/download/swift-wasm-6.1-RELEASE/swift-wasm-6.1-RELEASE-wasm32-unknown-wasi.artifactbundle.zip --checksum 7550b4c77a55f4b637c376f5d192f297fe185607003a6212ad608276928db992
+          swift sdk install https://github.com/swiftwasm/swift/releases/download/swift-wasm-6.1-RELEASE/swift-wasm-6.1-RELEASE-wasm32-unknown-wasip1-threads.artifactbundle.zip --checksum 0dd273be28741f8e1eb00682c39bdc956361ed24b5572e183dd8a4e9d1c5f6ec
+          swift sdk list
+      - name: Build
+        run: |
+          swift build --swift-sdk wasm32-unknown-wasi --target ArgumentParser
+          swift build --swift-sdk wasm32-unknown-wasip1-threads --target ArgumentParser
+
   soundness:
     name: Soundness
     uses: swiftlang/github-workflows/.github/workflows/soundness.yml@main

CHANGELOG.md

@@ -6,6 +6,17 @@ Add new items at the end of the relevant section under **Unreleased**.
 
 ## [Unreleased]
 
+---
+
+## [1.6.1] - 2025-07-01
+
+### Fixes
+
+- Resolves a source break for clients that have conditional conformances
+  to `ExpressibleByArgument` or `ParsableArguments`. ([#792])
+
+## [1.6.0] - 2025-06-30
+
 ### Additions
 
 - Options with `CaseIterable` types can now provide help descriptions on a per-value basis. ([#647])
@@ -16,6 +27,8 @@ Add new items at the end of the relevant section under **Unreleased**.
 
 - Testing and continuous integration improvements, including migrating to GitHub workflows.
   ([#692], [#693], [#696], [#698], [#699], [#700], [#701], [#708], [#711], [#718], [#716], [#714], [#712], [#732], [#730], [#746], [#747], [#760])
+- The associated closure for `CompletionKind.custom` now takes three parameters: the array of shell words currently in use for the completion request, the offset in that array for the word that completions are being requested for, and the prefix of that word that precedes the cursor. In addition, the associated closure can be `async`. The single-argument closure version of `CompletionKind.custom` is deprecated with this release. ([#763], [#770], [#782])
+- `ParsableArguments` and `ExpressibleByArgument` now conform to `SendableMetatype` when builing with a minimum Swift 6.2 compiler. ([#789])
 
 ### Fixes
 
@@ -30,6 +43,10 @@ Add new items at the end of the relevant section under **Unreleased**.
 - Better capturing of tool configuration in `ToolInfo`. ([#669], [#697])
 - Documentation improvements. ([#657], [#678], [#743])
 
+The 1.6.0 release includes contributions from [bripeticca], [cg-soft], [compnerd],
+[dshan4585], [heckj], [natecook1000], [rauhul], [rgoldberg], and [Steelskin].
+Thank you!
+
 ---
 
 ## [1.5.1] - 2025-05-28
@@ -943,7 +960,9 @@ This changelog's format is based on [Keep a Changelog](https://keepachangelog.co
 
 <!-- Link references for releases -->
 
-[Unreleased]: https://github.com/apple/swift-argument-parser/compare/1.5.1...HEAD
+[Unreleased]: https://github.com/apple/swift-argument-parser/compare/1.6.1...HEAD
+[1.6.1]: https://github.com/apple/swift-argument-parser/compare/1.6.0...1.6.1
+[1.6.0]: https://github.com/apple/swift-argument-parser/compare/1.5.1...1.6.0
 [1.5.1]: https://github.com/apple/swift-argument-parser/compare/1.5.0...1.5.1
 [1.5.0]: https://github.com/apple/swift-argument-parser/compare/1.4.0...1.5.0
 [1.4.0]: https://github.com/apple/swift-argument-parser/compare/1.3.1...1.4.0
@@ -1130,7 +1149,10 @@ This changelog's format is based on [Keep a Changelog](https://keepachangelog.co
 [#773]: https://github.com/apple/swift-argument-parser/pull/773
 [#775]: https://github.com/apple/swift-argument-parser/pull/775
 [#777]: https://github.com/apple/swift-argument-parser/pull/777
+[#782]: https://github.com/apple/swift-argument-parser/pull/782
 [#783]: https://github.com/apple/swift-argument-parser/pull/783
+[#789]: https://github.com/apple/swift-argument-parser/pull/789
+[#792]: https://github.com/apple/swift-argument-parser/pull/792
 
 <!-- Link references for contributors -->
 
@@ -1144,7 +1166,9 @@ This changelog's format is based on [Keep a Changelog](https://keepachangelog.co
 [atierian]: https://github.com/apple/swift-argument-parser/commits?author=atierian
 [Austinpayne]: https://github.com/apple/swift-argument-parser/commits?author=Austinpayne
 [BradLarson]: https://github.com/apple/swift-argument-parser/commits?author=BradLarson
+[bripeticca]: https://github.com/apple/swift-argument-parser/commits?author=bripeticca
 [buttaface]: https://github.com/apple/swift-argument-parser/commits?author=buttaface
+[cg-soft]: https://github.com/apple/swift-argument-parser/commits?author=cg-soft
 [Chamepp]: https://github.com/apple/swift-argument-parser/commits?author=Chamepp
 [clayellis]: https://github.com/apple/swift-argument-parser/commits?author=clayellis
 [CodaFi]: https://github.com/apple/swift-argument-parser/commits?author=CodaFi
@@ -1159,6 +1183,7 @@ This changelog's format is based on [Keep a Changelog](https://keepachangelog.co
 [dirtyhabits97]: https://github.com/apple/swift-argument-parser/commits?author=dirtyhabits97
 [DougGregor]: https://github.com/apple/swift-argument-parser/commits?author=DougGregor
 [drewmccormack]: https://github.com/apple/swift-argument-parser/commits?author=drewmccormack
+[dshan4585]: https://github.com/apple/swift-argument-parser/commits?author=dshan4585
 [elliottwilliams]: https://github.com/apple/swift-argument-parser/commits?author=elliottwilliams
 [erica]: https://github.com/apple/swift-argument-parser/commits?author=erica
 [finagolfin]: https://github.com/apple/swift-argument-parser/commits?author=finagolfin
@@ -1169,6 +1194,7 @@ This changelog's format is based on [Keep a Changelog](https://keepachangelog.co
 [gmittert]: https://github.com/apple/swift-argument-parser/commits?author=gmittert
 [griffin-stewie]: https://github.com/apple/swift-argument-parser/commits?author=griffin-stewie
 [gwynne]: https://github.com/apple/swift-argument-parser/commits?author=gwynne
+[heckj]: https://github.com/apple/swift-argument-parser/commits?author=heckj
 [iainsmith]: https://github.com/apple/swift-argument-parser/commits?author=iainsmith
 [ian-twilightcoder]: https://github.com/apple/swift-argument-parser/commits?author=ian-twilightcoder
 [ibrahimoktay]: https://github.com/apple/swift-argument-parser/commits?author=ibrahimoktay
@@ -1206,6 +1232,7 @@ This changelog's format is based on [Keep a Changelog](https://keepachangelog.co
 [randomeizer]: https://github.com/apple/swift-argument-parser/commits?author=randomeizer
 [rauhul]: https://github.com/apple/swift-argument-parser/commits?author=rauhul
 [revolter]: https://github.com/apple/swift-argument-parser/commits?author=revolter
+[rgoldberg]: https://github.com/apple/swift-argument-parser/commits?author=rgoldberg
 [rickrizzo]: https://github.com/apple/swift-argument-parser/commits?author=rickrizzo
 [rjstelling]: https://github.com/apple/swift-argument-parser/commits?author=rjstelling
 [robertmryan]: https://github.com/apple/swift-argument-parser/commits?author=robertmryan
@@ -1215,6 +1242,7 @@ This changelog's format is based on [Keep a Changelog](https://keepachangelog.co
 [sgl0v]: https://github.com/apple/swift-argument-parser/commits?author=sgl0v
 [sharplet]: https://github.com/apple/swift-argument-parser/commits?author=sharplet
 [sjavora]: https://github.com/apple/swift-argument-parser/commits?author=sjavora
+[Steelskin]: https://github.com/apple/swift-argument-parser/commits?author=Steelskin
 [stuartcarnie]: https://github.com/apple/swift-argument-parser/commits?author=stuartcarnie
 [thomasvl]: https://github.com/apple/swift-argument-parser/commits?author=thomasvl
 [TiagoMaiaL]: https://github.com/apple/swift-argument-parser/commits?author=TiagoMaiaL

Examples/repeat/Repeat.swift

@@ -13,7 +13,7 @@ import ArgumentParser
 
 @main
 struct Repeat: ParsableCommand {
-  @Option(help: "The number of times to repeat 'phrase'.")
+  @Option(help: "How many times to repeat 'phrase'.")
   var count: Int? = nil
 
   @Flag(help: "Include a counter with each repetition.")

README.md

@@ -18,7 +18,7 @@ struct Repeat: ParsableCommand {
     @Flag(help: "Include a counter with each repetition.")
     var includeCounter = false
 
-    @Option(name: .shortAndLong, help: "The number of times to repeat 'phrase'.")
+    @Option(name: .shortAndLong, help: "How many times to repeat 'phrase'.")
     var count: Int? = nil
 
     @Argument(help: "The phrase to repeat.")

Sources/ArgumentParser/CMakeLists.txt

@@ -46,6 +46,7 @@ add_library(ArgumentParser
   Utilities/Platform.swift
   Utilities/SequenceExtensions.swift
   Utilities/StringExtensions.swift
+  Utilities/SwiftExtensions.swift
   Utilities/Tree.swift
 
   Validators/CodingKeyValidator.swift

Sources/ArgumentParser/Parsable Properties/CompletionKind.swift

@@ -41,6 +41,9 @@ public struct CompletionKind {
     case directory
     case shellCommand(String)
     case custom(@Sendable ([String], Int, String) -> [String])
+    #if !canImport(Dispatch)
+    @available(*, unavailable, message: "DispatchSemaphore is unavailable")
+    #endif
     case customAsync(@Sendable ([String], Int, String) async -> [String])
     case customDeprecated(@Sendable ([String]) -> [String])
   }
@@ -181,11 +184,18 @@ public struct CompletionKind {
   ///
   /// The same as `custom(@Sendable @escaping ([String], Int, String) -> [String])`,
   /// except that the closure is asynchronous.
+  #if !canImport(Dispatch)
+  @available(*, unavailable, message: "DispatchSemaphore is unavailable")
+  #endif
   @available(macOS 10.15, macCatalyst 13, iOS 13, tvOS 13, watchOS 6, *)
   public static func custom(
     _ completion: @Sendable @escaping ([String], Int, String) async -> [String]
   ) -> CompletionKind {
+    #if !canImport(Dispatch)
+    fatalError("DispatchSemaphore is unavailable")
+    #else
     CompletionKind(kind: .customAsync(completion))
+    #endif
   }
 
   /// Deprecated; only kept for backwards compatibility.

Sources/ArgumentParser/Parsable Types/ExpressibleByArgument.swift

@@ -10,7 +10,7 @@
 //===----------------------------------------------------------------------===//
 
 /// A type that can be expressed as a command-line argument.
-public protocol ExpressibleByArgument {
+public protocol ExpressibleByArgument: _SendableMetatype {
   /// Creates a new instance of this type from a command-line-specified
   /// argument.
   init?(argument: String)

Sources/ArgumentParser/Parsable Types/ParsableArguments.swift

@@ -13,7 +13,7 @@
 ///
 /// When you implement a `ParsableArguments` type, all properties must be declared with
 /// one of the four property wrappers provided by the `ArgumentParser` library.
-public protocol ParsableArguments: Decodable {
+public protocol ParsableArguments: Decodable, _SendableMetatype {
   /// Creates an instance of this parsable type using the definitions
   /// given by each property's wrapper.
   init()

Sources/ArgumentParser/Parsing/CommandParser.swift

@@ -10,11 +10,15 @@
 //===----------------------------------------------------------------------===//
 
 #if swift(>=6.0)
+#if canImport(Dispatch)
 @preconcurrency private import class Dispatch.DispatchSemaphore
+#endif
 internal import class Foundation.NSLock
 internal import class Foundation.ProcessInfo
 #else
+#if canImport(Dispatch)
 @preconcurrency import class Dispatch.DispatchSemaphore
+#endif
 import class Foundation.NSLock
 import class Foundation.ProcessInfo
 #endif
@@ -474,12 +478,16 @@ extension CommandParser {
         completingPrefix
       )
     case .customAsync(let complete):
+      #if canImport(Dispatch)
       if #available(macOS 10.15, macCatalyst 13, iOS 13, tvOS 13, watchOS 6, *)
       {
         completions = try asyncCustomCompletions(from: args, complete: complete)
       } else {
         throw ParserError.invalidState
       }
+      #else
+      throw ParserError.invalidState
+      #endif
     case .customDeprecated(let complete):
       completions = complete(args)
     default:
@@ -528,11 +536,17 @@ private func parseCustomCompletionArguments(
   return (Array(args), completingArgumentIndex, completingPrefix)
 }
 
+#if !canImport(Dispatch)
+@available(*, unavailable, message: "DispatchSemaphore is unavailable")
+#endif
 @available(macOS 10.15, macCatalyst 13, iOS 13, tvOS 13, watchOS 6, *)
 private func asyncCustomCompletions(
   from args: [String],
   complete: @escaping @Sendable ([String], Int, String) async -> [String]
 ) throws -> [String] {
+  #if !canImport(Dispatch)
+  throw ParserError.invalidState
+  #else
   let (args, completingArgumentIndex, completingPrefix) =
     try parseCustomCompletionArguments(from: args)
 
@@ -550,6 +564,7 @@ private func asyncCustomCompletions(
 
   semaphore.wait()
   return completionsBox.value
+  #endif
 }
 
 // Helper class to make values sendable across concurrency boundaries

Sources/ArgumentParser/Utilities/SwiftExtensions.swift

@@ -0,0 +1,17 @@
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift Argument Parser open source project
+//
+// Copyright (c) 2020 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+//
+//===----------------------------------------------------------------------===//
+
+#if compiler(>=6.2)
+/// Designates a type as having a sendable metatype.
+@_marker public protocol _SendableMetatype: SendableMetatype {}
+#else
+@_marker public protocol _SendableMetatype {}
+#endif