Skip to content

Cleanup sendable conformance for DependencyBuilderError #308

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
skorulis-ap merged 1 commit into from
Oct 22, 2025
Merged

Cleanup sendable conformance for DependencyBuilderError #308

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
15 changes: 9 additions & 6 deletions Sources/Knit/Module/DependencyBuilder.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,10 @@ final class DependencyBuilder {
return created
}

throw DependencyBuilderError.moduleNotProvided(moduleType, dependencyTree.sourcePathString(moduleType: moduleType))
throw DependencyBuilderError.moduleNotProvided(
String(describing: moduleType),
dependencyTree.sourcePathString(moduleType: moduleType)
)
}

private func gatherDependencies(
Expand Down Expand Up @@ -112,7 +115,7 @@ final class DependencyBuilder {
do {
try assemblyValidation(resolved)
} catch {
throw DependencyBuilderError.assemblyValidationFailure(resolved, reason: error)
throw DependencyBuilderError.assemblyValidationFailure(String(describing: resolved), reason: error)
}
}

Expand Down Expand Up @@ -160,16 +163,16 @@ final class DependencyBuilder {

let type = defaultType.erasedType
guard type.doesReplace(type: moduleType) else {
throw DependencyBuilderError.invalidDefault(type, moduleType)
throw DependencyBuilderError.invalidDefault(String(describing: type), String(describing: moduleType))
}
return type
}
}

public enum DependencyBuilderError: LocalizedError {
case moduleNotProvided(_ moduleType: any ModuleAssembly.Type, _ sourcePath: String)
case invalidDefault(_ overrideType: any ModuleAssembly.Type, _ moduleType: any ModuleAssembly.Type)
case assemblyValidationFailure(_ moduleType: any ModuleAssembly.Type, reason: Swift.Error)
case moduleNotProvided(_ moduleType: String, _ sourcePath: String)
case invalidDefault(_ overrideType: String, _ moduleType: String)
case assemblyValidationFailure(_ moduleType: String, reason: Swift.Error)

public var errorDescription: String? {
switch self {
Expand Down
5 changes: 4 additions & 1 deletion Sources/Knit/Module/ScopedModuleAssembler.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,10 @@ public final class ScopedModuleAssembler<TargetResolver> {
actual: String(describing: moduleAssemblyType.resolverType)
)

throw DependencyBuilderError.assemblyValidationFailure(moduleAssemblyType, reason: scopingError)
throw DependencyBuilderError.assemblyValidationFailure(
String(describing: moduleAssemblyType),
reason: scopingError
)
}
}
self.internalAssembler = try ModuleAssembler(
Expand Down
2 changes: 1 addition & 1 deletion Tests/KnitTests/DependencyBuilderTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ final class DependencyBuilderTests: XCTestCase {
)

if case let DependencyBuilderError.assemblyValidationFailure(moduleType, reason: reasonError) = error {
XCTAssert(moduleType == Assembly1.self)
XCTAssert(moduleType == "Assembly1")
if case DependencyBuilderTestError.failedValidation = reasonError {
// Correct `reasonError`
} else {
Expand Down