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

Remove `handleRustBoxing` config from `SymbolVisitor` (#1824)

parent 057fe971

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

+0 −1
Original line number Diff line number Diff line
@@ -69,7 +69,6 @@ class CodegenVisitor( 
            SymbolVisitorConfig(

                runtimeConfig = settings.runtimeConfig,

                renameExceptions = settings.codegenConfig.renameExceptions,

                handleRustBoxing = true,

                nullabilityCheckMode = NullableIndex.CheckMode.CLIENT_ZERO_VALUE_V1,

            )

        val baseModel = baselineTransform(context.model)

codegen-core/src/main/kotlin/software/amazon/smithy/rust/codegen/core/smithy/SymbolVisitor.kt

+1 −7
Original line number Diff line number Diff line
@@ -65,7 +65,6 @@ val SimpleShapes: Map<KClass<out Shape>, RustType> = mapOf( 
data class SymbolVisitorConfig(

    val runtimeConfig: RuntimeConfig,

    val renameExceptions: Boolean,

    val handleRustBoxing: Boolean,

    val nullabilityCheckMode: NullableIndex.CheckMode,

)
@@ -328,13 +327,8 @@ open class SymbolVisitor( 


    override fun memberShape(shape: MemberShape): Symbol {

        val target = model.expectShape(shape.target)

        val targetSymbol = this.toSymbol(target)

        // Handle boxing first so we end up with Option<Box<_>>, not Box<Option<_>>

        return targetSymbol.letIf(config.handleRustBoxing) {

            handleRustBoxing(it, shape)

        }.let {

            handleOptionality(it, shape)

        }

        return handleOptionality(handleRustBoxing(toSymbol(target), shape), shape)

    }



    override fun timestampShape(shape: TimestampShape?): Symbol {

codegen-core/src/main/kotlin/software/amazon/smithy/rust/codegen/core/smithy/generators/StructureGenerator.kt

+1 −1
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ open class StructureGenerator( 
        writer.renderMemberDoc(member, memberSymbol)

        writer.deprecatedShape(member)

        memberSymbol.expectRustMetadata().render(writer)

        writer.write("$memberName: #T,", symbolProvider.toSymbol(member))

        writer.write("$memberName: #T,", memberSymbol)

    }



    open fun renderStructure() {

codegen-core/src/main/kotlin/software/amazon/smithy/rust/codegen/core/testutil/TestHelpers.kt

+0 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ val TestRuntimeConfig = 
val TestSymbolVisitorConfig = SymbolVisitorConfig(

    runtimeConfig = TestRuntimeConfig,

    renameExceptions = true,

    handleRustBoxing = true,

    nullabilityCheckMode = NullableIndex.CheckMode.CLIENT_ZERO_VALUE_V1,

)

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

+0 −1
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ class PythonServerCodegenVisitor( 
            SymbolVisitorConfig(

                runtimeConfig = settings.runtimeConfig,

                renameExceptions = false,

                handleRustBoxing = true,

                nullabilityCheckMode = NullableIndex.CheckMode.SERVER,

            )

        val baseModel = baselineTransform(context.model)