Skip to content

Commit a6c4592

Browse files
committed
fix rebase conflict that led to invalid code
1 parent 6280fa4 commit a6c4592

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

codegen-server/src/main/kotlin/software/amazon/smithy/rust/codegen/server/smithy/ServerSymbolProviders.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ class ServerSymbolProviders private constructor(
3131
rustSymbolProviderConfig: RustSymbolProviderConfig,
3232
publicConstrainedTypes: Boolean,
3333
codegenDecorator: ServerCodegenDecorator,
34-
baseSymbolProviderFactory: (model: Model, service: ServiceShape, symbolVisitorConfig: SymbolVisitorConfig, publicConstrainedTypes: Boolean, includeConstraintShapeProvider: Boolean, codegenDecorator: ServerCodegenDecorator) -> RustSymbolProvider,
34+
baseSymbolProviderFactory: (settings: ServerRustSettings, model: Model, service: ServiceShape, rustSymbolProviderConfig: RustSymbolProviderConfig, publicConstrainedTypes: Boolean, includeConstraintShapeProvider: Boolean, codegenDecorator: ServerCodegenDecorator) -> RustSymbolProvider,
3535
): ServerSymbolProviders {
36-
val baseSymbolProvider = baseSymbolProviderFactory(model, service, symbolVisitorConfig, publicConstrainedTypes, publicConstrainedTypes, codegenDecorator)
36+
val baseSymbolProvider = baseSymbolProviderFactory(settings, model, service, rustSymbolProviderConfig, publicConstrainedTypes, publicConstrainedTypes, codegenDecorator)
3737
return ServerSymbolProviders(
3838
symbolProvider = baseSymbolProvider,
3939
constrainedShapeSymbolProvider = baseSymbolProviderFactory(

0 commit comments

Comments
 (0)