Merge pull request #2202 from ahoppen/fix-build-warnings

Fix a couple build warnings

Author: ahoppen

Sources/CompletionScoring/Utilities/SwiftExtensions.swift

@@ -232,7 +232,7 @@ extension RandomAccessCollection {
     return body(scratchArea)
   }
 
-  package func concurrentCompactMap<T>(_ f: @Sendable (Element) -> T?) -> [T] where Self: Sendable {
+  package func concurrentCompactMap<T>(_ f: @Sendable (Element) -> T?) -> [T] where Self: Sendable, Index: Sendable {
     return withMapScratchArea { (results: UnsafeMutablePointer<T?>) -> [T] in
       // `nonisolated(unsafe)` is fine because we write to different offsets within the buffer on every concurrent
       // iteration.
@@ -245,7 +245,7 @@ extension RandomAccessCollection {
     }
   }
 
-  package func concurrentMap<T>(_ f: @Sendable (Element) -> T) -> [T] where Self: Sendable {
+  package func concurrentMap<T>(_ f: @Sendable (Element) -> T) -> [T] where Self: Sendable, Index: Sendable {
     return withMapScratchArea { (results: UnsafeMutablePointer<T>) -> [T] in
       // `nonisolated(unsafe)` is fine because we write to different offsets within the buffer on every concurrent
       // iteration.
@@ -289,8 +289,13 @@ protocol ContiguousZeroBasedIndexedCollection: Collection where Index == Int {
   var indices: Range<Int> { get }
 }
 
+#if compiler(<6.2)
+/// Provide a compatibility layer for `SendableMetatype` if it doesn't exist in the compiler
+typealias SendableMetatype = Any
+#endif
+
 extension ContiguousZeroBasedIndexedCollection {
-  func slicedConcurrentForEachSliceRange(body: @Sendable (Range<Index>) -> Void) {
+  func slicedConcurrentForEachSliceRange(body: @Sendable (Range<Index>) -> Void) where Self: SendableMetatype {
     // We want to use `DispatchQueue.concurrentPerform`, but we want to be called only a few times. So that we
     // can amortize per-callback work. We also want to oversubscribe so that we can efficiently use
     // heterogeneous CPUs. If we had 4 efficiency cores, and 4 performance cores, and we dispatched 8 work items

Sources/SKLogging/LoggingScope.swift

@@ -43,7 +43,7 @@ package final class LoggingScope {
 package func withLoggingSubsystemAndScope<Result>(
   subsystem: String,
   scope: String?,
-  @_inheritActorContext _ operation: @Sendable () throws -> Result
+  _ operation: @Sendable () throws -> Result
 ) rethrows -> Result {
   return try LoggingScope.$_subsystem.withValue(subsystem) {
     return try LoggingScope.$_scope.withValue(scope, operation: operation)

Sources/SourceKitLSP/Swift/CodeActions/SyntaxCodeActionProvider.swift

@@ -15,9 +15,14 @@ import SKLogging
 import SwiftRefactor
 import SwiftSyntax
 
+#if compiler(<6.2)
+/// Provide a compatibility layer for `SendableMetatype` if it doesn't exist in the compiler
+typealias SendableMetatype = Any
+#endif
+
 /// Describes types that provide one or more code actions based on purely
 /// syntactic information.
-protocol SyntaxCodeActionProvider {
+protocol SyntaxCodeActionProvider: SendableMetatype {
   /// Produce code actions within the given scope. Each code action
   /// corresponds to one syntactic transformation that can be performed, such
   /// as adding or removing separators from an integer literal.

Sources/SwiftExtensions/AsyncUtils.swift

@@ -132,7 +132,7 @@ package func withCancellableCheckedThrowingContinuation<Handle: Sendable, Result
   )
 }
 
-extension Collection where Element: Sendable {
+extension Collection where Self: Sendable, Element: Sendable {
   /// Transforms all elements in the collection concurrently and returns the transformed collection.
   package func concurrentMap<TransformedElement: Sendable>(
     maxConcurrentTasks: Int = ProcessInfo.processInfo.processorCount,

Tests/BuildServerIntegrationTests/SwiftPMBuildServerTests.swift

@@ -770,7 +770,7 @@ struct SwiftPMBuildServerTests {
       // We opened the project from a symlink. The realpath isn't part of the project and we should thus not receive
       // build settings for it.
       #expect(
-        try await #require(
+        try #require(
           await buildServerManager.buildSettingsInferredFromMainFile(
             for: DocumentURI(aswiftReal),
             language: .swift,