Merge main into release/6.2

.github/workflows/automerge.yml

@@ -0,0 +1,17 @@
+name: Create PR to merge main into release branch
+# In the first period after branching the release branch, we typically want to include many changes from `main` in the release branch. This workflow automatically creates a PR every Monday to merge main into the release branch.
+# Later in the release cycle we should stop this practice to avoid landing risky changes by disabling this workflow. To do so, disable the workflow as described in https://docs.github.com/en/actions/managing-workflow-runs-and-deployments/managing-workflow-runs/disabling-and-enabling-a-workflow
+on:
+  schedule:
+    - cron: '0 9 * * MON'
+  workflow_dispatch:
+jobs:
+  create_merge_pr:
+    name: Create PR to merge main into release branch
+    uses: swiftlang/github-workflows/.github/workflows/create_automerge_pr.yml@main
+    with:
+      base_branch: release/6.2
+    permissions:
+      contents: write
+      pull-requests: write
+    if: (github.event_name == 'schedule' && github.repository == 'swiftlang/swift-foundation') || (github.event_name != 'schedule')  # Ensure that we don't run this on a schedule in a fork

.github/workflows/pull_request.yml

@@ -0,0 +1,24 @@
+name: Pull request
+
+on:
+  pull_request:
+    types: [opened, reopened, synchronize]
+
+jobs:
+  tests:
+    name: Test
+    uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@main
+    with:
+      linux_swift_versions: '["nightly-main"]'
+      windows_swift_versions: '["nightly-main"]'
+
+  soundness:
+    name: Soundness
+    uses: swiftlang/github-workflows/.github/workflows/soundness.yml@main
+    with:
+      license_header_check_project_name: "Swift.org"
+      license_header_check_enabled: false
+      docs_check_enabled: false
+      format_check_enabled: false
+      unacceptable_language_check_enabled: false
+      api_breakage_check_enabled: false

Benchmarks/Benchmarks/Formatting/BenchmarkFormatting.swift

@@ -45,15 +45,15 @@ let benchmarks = {
 
     let preformatted = formats.map { ($0, $0.format(date)) }
 
-    Benchmark("iso860-format", configuration: .init(scalingFactor: .kilo)) { benchmark in
+    Benchmark("iso8601-format", configuration: .init(scalingFactor: .kilo)) { benchmark in
         for _ in benchmark.scaledIterations {
             for fmt in formats {
                 blackHole(fmt.format(date))
             }
         }
     }
 
-    Benchmark("iso860-parse", configuration: .init(scalingFactor: .kilo)) { benchmark in
+    Benchmark("iso8601-parse", configuration: .init(scalingFactor: .kilo)) { benchmark in
         for _ in benchmark.scaledIterations {
             for fmt in preformatted {
                 let result = try? fmt.0.parse(fmt.1)

Benchmarks/Benchmarks/URL/BenchmarkURL.swift

@@ -231,4 +231,50 @@ let benchmarks = {
         }
     }
 
+    Benchmark("URL-Template-parsing") { benchmark in
+        for _ in benchmark.scaledIterations {
+            blackHole(URL.Template("/api/{version}/accounts/{accountId}/transactions/{transactionId}{?expand*,fields*,embed*,format}")!)
+            blackHole(URL.Template("/special/{+a}/details")!)
+            blackHole(URL.Template("/documents/{documentId}{#section,paragraph}")!)
+        }
+    }
+
+    let templates = [
+        URL.Template("/var/{var}/who/{who}/x/{x}{?keys*,count*,list*,y}")!,
+        URL.Template("/special/{+keys}/details")!,
+        URL.Template("x/y/{#path:6}/here")!,
+        URL.Template("a/b{/var,x}/here")!,
+        URL.Template("a{?var,y}")!,
+    ]
+
+    var variables: [URL.Template.VariableName: URL.Template.Value] = [
+        .init("count"): ["one", "two", "three"],
+        .init("dom"): ["example", "com"],
+        .init("dub"): "me/too",
+        .init("hello"): "Hello World!",
+        .init("half"): "50%",
+        .init("var"): "value",
+        .init("who"): "fred",
+        .init("base"): "http://example.com/home/",
+        .init("path"): "/foo/bar",
+        .init("list"): ["red", "green", "blue"],
+        .init("keys"): [
+            "semi": ";",
+            "dot": ".",
+            "comma": ",",
+        ],
+        .init("v"): "6",
+        .init("x"): "1024",
+        .init("y"): "768",
+        .init("empty"): "",
+        .init("empty_keys"): [:],
+    ]
+
+    Benchmark("URL-Template-expansion") { benchmark in
+        for _ in benchmark.scaledIterations {
+            for t in templates {
+                blackHole(URL(template: t, variables: variables))
+            }
+        }
+    }
 }

Package.swift

@@ -35,9 +35,10 @@ let availabilityMacros: [SwiftSetting] = versionNumbers.flatMap { version in
     }
 }
 
-let concurrencyChecking: [SwiftSetting] = [
+let featureSettings: [SwiftSetting] = [
     .enableExperimentalFeature("StrictConcurrency"),
-    .enableUpcomingFeature("InferSendableFromCaptures")
+    .enableUpcomingFeature("InferSendableFromCaptures"),
+    .enableUpcomingFeature("MemberImportVisibility")
 ]
 
 var dependencies: [Package.Dependency] {
@@ -98,7 +99,7 @@ let package = Package(
                 "FoundationInternationalization",
             ],
             cSettings: wasiLibcCSettings,
-            swiftSettings: availabilityMacros + concurrencyChecking
+            swiftSettings: availabilityMacros + featureSettings
         ),
 
         // FoundationEssentials
@@ -134,7 +135,7 @@ let package = Package(
           swiftSettings: [
             .enableExperimentalFeature("VariadicGenerics"),
             .enableExperimentalFeature("AccessLevelOnImport")
-          ] + availabilityMacros + concurrencyChecking,
+          ] + availabilityMacros + featureSettings,
           linkerSettings: [
             .linkedLibrary("wasi-emulated-getpid", .when(platforms: [.wasi])),
           ]
@@ -148,7 +149,7 @@ let package = Package(
             resources: [
                 .copy("Resources")
             ],
-            swiftSettings: availabilityMacros + concurrencyChecking
+            swiftSettings: availabilityMacros + featureSettings
         ),
 
         // FoundationInternationalization
@@ -172,7 +173,7 @@ let package = Package(
             cSettings: wasiLibcCSettings,
             swiftSettings: [
                 .enableExperimentalFeature("AccessLevelOnImport")
-            ] + availabilityMacros + concurrencyChecking
+            ] + availabilityMacros + featureSettings
         ),
 
         .testTarget(
@@ -181,7 +182,7 @@ let package = Package(
                 "TestSupport",
                 "FoundationInternationalization",
             ],
-            swiftSettings: availabilityMacros + concurrencyChecking
+            swiftSettings: availabilityMacros + featureSettings
         ),
 
         // FoundationMacros
@@ -198,7 +199,7 @@ let package = Package(
             exclude: ["CMakeLists.txt"],
             swiftSettings: [
                 .enableExperimentalFeature("AccessLevelOnImport")
-            ] + availabilityMacros + concurrencyChecking
+            ] + availabilityMacros + featureSettings
         ),
     ]
 )
@@ -213,7 +214,7 @@ package.targets.append(contentsOf: [
             "FoundationMacros",
             "TestSupport"
         ],
-        swiftSettings: availabilityMacros + concurrencyChecking
+        swiftSettings: availabilityMacros + featureSettings
     )
 ])
 #endif