Unverified Commit e6220849 authored by John DiSanti's avatar John DiSanti Committed by GitHub
Browse files

Add `RustSettings` to `CodegenContext` (#752) 

* Add `RustSettings` to `CodegenContext`

* Update changelog
parent fc4a9c52

CHANGELOG.md

+2 −0
Original line number Diff line number Diff line 
vNext (Month Day, Year)

=======================



- Add `RustSettings` to `CodegenContext` (smithy-rs#616, smithy-rs#752)



v0.25.1 (October 11th, 2021)

=========================

**New this week**

aws/sdk-codegen/src/test/kotlin/software/amazon/smithy/rustsdk/EndpointConfigCustomizationTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ import software.amazon.smithy.rust.codegen.rustlang.CargoDependency 
import software.amazon.smithy.rust.codegen.testutil.asSmithyModel

import software.amazon.smithy.rust.codegen.testutil.compileAndTest

import software.amazon.smithy.rust.codegen.testutil.stubConfigProject

import software.amazon.smithy.rust.codegen.testutil.testProtocolConfig

import software.amazon.smithy.rust.codegen.testutil.testCodegenContext

import software.amazon.smithy.rust.codegen.testutil.unitTest

import software.amazon.smithy.rust.codegen.testutil.validateConfigCustomizations

import software.amazon.smithy.rust.codegen.util.lookup
@@ -98,7 +98,7 @@ internal class EndpointConfigCustomizationTest { 


    fun endpointCustomization(service: String) =

        EndpointConfigCustomization(

            testProtocolConfig(

            testCodegenContext(

                model,

                model.lookup(service)

            ).copy(runtimeConfig = AwsTestRuntimeConfig),

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

+1 −8
Original line number Diff line number Diff line
@@ -105,14 +105,7 @@ class CodegenVisitor(context: PluginContext, private val codegenDecorator: RustC 
        symbolProvider =

            codegenDecorator.symbolProvider(generator.symbolProvider(model, baseProvider))



        codegenContext = CodegenContext(

            model,

            symbolProvider,

            settings.runtimeConfig,

            service,

            protocol,

            settings.moduleName

        )

        codegenContext = CodegenContext(model, symbolProvider, service, protocol, settings)



        rustCrate = RustCrate(context.fileManifest, symbolProvider, DefaultPublicModules)

        protocolGenerator = protocolGeneratorFactory.buildProtocolGenerator(codegenContext)

codegen/src/main/kotlin/software/amazon/smithy/rust/codegen/smithy/CodegenContext.kt

+11 −2
Original line number Diff line number Diff line
@@ -18,5 +18,14 @@ data class CodegenContext( 
    val runtimeConfig: RuntimeConfig,

    val serviceShape: ServiceShape,

    val protocol: ShapeId,

    val moduleName: String

)
 
    val moduleName: String,

    val settings: RustSettings,

) {

    constructor(

        model: Model,

        symbolProvider: RustSymbolProvider,

        serviceShape: ServiceShape,

        protocol: ShapeId,

        settings: RustSettings,

    ) : this(model, symbolProvider, settings.runtimeConfig, serviceShape, protocol, settings.moduleName, settings)

}

codegen/src/main/kotlin/software/amazon/smithy/rust/codegen/smithy/CodegenVisitor.kt

+1 −2
Original line number Diff line number Diff line
@@ -64,8 +64,7 @@ class CodegenVisitor(context: PluginContext, private val codegenDecorator: RustC 
        val baseProvider = RustCodegenPlugin.baseSymbolProvider(model, service, symbolVisitorConfig)

        symbolProvider = codegenDecorator.symbolProvider(generator.symbolProvider(model, baseProvider))



        codegenContext =

            CodegenContext(model, symbolProvider, settings.runtimeConfig, service, protocol, settings.moduleName)

        codegenContext = CodegenContext(model, symbolProvider, service, protocol, settings)

        rustCrate = RustCrate(

            context.fileManifest,

            symbolProvider,