Skip to content

Swift Driver: Unknown Subcommand Location #1962

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 1 commit into from
Jul 31, 2025
Merged

Swift Driver: Unknown Subcommand Location #1962

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 5 additions & 2 deletions Sources/SwiftDriver/Driver/Driver.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ extension Driver.ErrorDiagnostics: CustomStringConvertible {
/// The Swift driver.
public struct Driver {
public enum Error: Swift.Error, Equatable, DiagnosticData {
case unknownOrMissingSubcommand(String)
case unknownOrMissingSubcommand(String, String?)
case invalidDriverName(String)
case invalidInput(String)
case noInputFiles
Expand Down Expand Up @@ -82,7 +82,10 @@ public struct Driver {

public var description: String {
switch self {
case .unknownOrMissingSubcommand(let subcommand):
case .unknownOrMissingSubcommand(let subcommand, let directory):
if let directory {
return "unknown or missing subcommand '\(subcommand)' in '\(directory)'"
}
return "unknown or missing subcommand '\(subcommand)'"
case .invalidDriverName(let driverName):
return "invalid driver name: \(driverName)"
Expand Down
8 changes: 6 additions & 2 deletions Sources/swift-driver/main.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,11 @@ do {
let legacyDriverCommand = [path] + CommandLine.arguments[1...]
try exec(path: path, args: legacyDriverCommand)
} else {
throw Driver.Error.unknownOrMissingSubcommand(legacyExecutablePath.lastPathComponent)
throw Driver.Error.unknownOrMissingSubcommand(
legacyExecutablePath.lastPathComponent,
legacyExecutablePath
.deletingLastPathComponent()
.withUnsafeFileSystemRepresentation { String(cString: $0!) })
}
}

Expand All @@ -127,7 +131,7 @@ do {

guard let subcommandPath = subcommandPath,
localFileSystem.exists(subcommandPath) else {
throw Driver.Error.unknownOrMissingSubcommand(subcommand)
throw Driver.Error.unknownOrMissingSubcommand(subcommand, nil)
}

// Pass the full path to subcommand executable.
Expand Down