Skip to content

Modernize this code base #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
May 22, 2025
Merged

Modernize this code base #24

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
9a80602
Update Xcode/SwiftPM fluff
lorentey May 21, 2025
b306c88
Stop supporting a built-in chart library
lorentey May 21, 2025
3b08605
Bump required toolchain to Swift 6.0, and minimum deployment target t…
lorentey May 21, 2025
cb1db64
Update to latest versions of dependencies
lorentey May 21, 2025
8526d9f
Sprinkle Sendable annotations over the project
lorentey May 21, 2025
5c7f4e9
Fix concurrency-safety of _ExecutionContext
lorentey May 21, 2025
d2ca3f9
Adopt SuspendingClock and Duration
lorentey May 21, 2025
c8f1422
`#file` → `#filePath`
lorentey May 21, 2025
77147d8
Enable MemberImportVisibility and fix the issues it uncovers
lorentey May 21, 2025
37eefc1
Update workflow setup
lorentey May 21, 2025
32ca0c0
Fix compatibility with Swift 6.1
lorentey May 21, 2025
ee56fa3
More metaupdates
lorentey May 21, 2025
887a90d
The yml linter is being ridiculous
lorentey May 21, 2025
58fa734
More concurrency fixes
lorentey May 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Stop supporting a built-in chart library
  • Loading branch information
@lorentey
lorentey committed May 21, 2025
commit b306c88e1407428592c51a867ff5082b58f272ac
12 changes: 3 additions & 9 deletions Sources/CollectionsBenchmark/Benchmark/Benchmark+ChartLibrary.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
//
// This source file is part of the Swift Collections open source project
//
// Copyright (c) 2021 Apple Inc. and the Swift project authors
// Copyright (c) 2021 - 2025 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
Expand Down Expand Up @@ -47,14 +47,8 @@ extension Benchmark.ChartLibrary {
}

extension Benchmark {
internal func _loadLibrary(_ path: FilePath?) throws -> ChartLibrary {
if let path = path {
return try Benchmark.ChartLibrary.load(from: path)
}
if let library = self.chartLibrary {
return library
}
throw Benchmark.Error("No predefined library configuration")
internal func _loadLibrary(_ path: FilePath) throws -> ChartLibrary {
try Benchmark.ChartLibrary.load(from: path)
}
}

Expand Down
4 changes: 1 addition & 3 deletions Sources/CollectionsBenchmark/Benchmark/Benchmark.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
//
// This source file is part of the Swift Collections open source project
//
// Copyright (c) 2021 Apple Inc. and the Swift project authors
// Copyright (c) 2021 - 2025 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
Expand All @@ -17,8 +17,6 @@ public struct Benchmark {
internal var _inputGenerators: [_TypeBox: (Int) -> Any] = [:]
private let _executionContext = _ExecutionContext.shared

public var chartLibrary: ChartLibrary? = nil

public init(title: String = "") {
self.title = title
registerInputGenerator(for: Int.self) { size in
Expand Down
4 changes: 2 additions & 2 deletions Sources/CollectionsBenchmark/BenchmarkCLI/BenchmarkCLI+Library+List.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ extension _BenchmarkCLI.Library {
}

@Option(
help: "Path to a library configuration file in JSON format. (default: built-in library)",
help: "Path to a library configuration file in JSON format.",
completion: .file(extensions: ["json"]),
transform: { str in FilePath(str) })
var library: FilePath?
var library: FilePath

@Flag(help: "List all tasks included in the library.")
var tasks = false
Expand Down
4 changes: 2 additions & 2 deletions Sources/CollectionsBenchmark/BenchmarkCLI/BenchmarkCLI+Library+Render.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ extension _BenchmarkCLI.Library {
}

@Option(
help: "Path to a library configuration file in JSON format. (default: built-in library)",
help: "Path to a library configuration file in JSON format.",
completion: .file(extensions: ["json"]),
transform: { str in FilePath(str) })
var library: FilePath?
var library: FilePath

@Argument(
help: "A path to a benchmark results document.",
Expand Down
4 changes: 2 additions & 2 deletions Sources/CollectionsBenchmark/BenchmarkCLI/BenchmarkCLI+Library+Run.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ extension _BenchmarkCLI.Library {
}

@Option(
help: "Path to a library configuration file in JSON format. (default: built-in library)",
help: "Path to a library configuration file in JSON format.",
completion: .file(extensions: ["json"]),
transform: { str in FilePath(str) })
internal var library: FilePath?
internal var library: FilePath

@Argument(
help: "Output filename.",
Expand Down