Unverified Commit fc3af3fe authored by Russell Cohen's avatar Russell Cohen Committed by GitHub
Browse files

Add more naming hygiene for Result (#502) 

* Add more naming hygiene for Result

* Fix missing <

* Fix broken test
parent bf0389bf

aws/sdk-codegen/src/main/kotlin/software/amazon/smithy/rustsdk/FluentClientGenerator.kt

+3 −3
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ class FluentClientGenerator(protocolConfig: ProtocolConfig) { 
                        Self { handle, inner: Default::default() }

                    }



                    pub async fn send(self) -> Result<#{ok}, #{sdk_err}<#{operation_err}>>

                    pub async fn send(self) -> std::result::Result<#{ok}, #{sdk_err}<#{operation_err}>>

                      where C: #{aws_hyper}::SmithyConnector,

                    {

                        let input = self.inner.build().map_err(|err|#{sdk_err}::ConstructionFailure(err.into()))?;

codegen-test/model/naming-obstacle-course.smithy

+20 −1
Original line number Diff line number Diff line
@@ -14,7 +14,9 @@ service Config { 
    operations: [

       ReservedWordsAsMembers,

       StructureNamePunning,

       ErrCollisions

       ErrCollisions,

       Result,

       Option,

    ]

}
@@ -72,6 +74,13 @@ structure Vec { 
    pv_member: Boolean

}



structure Some {

    pv_member: Boolean

}



structure None {

}





operation ErrCollisions {

    errors: [
@@ -81,6 +90,16 @@ operation ErrCollisions { 
    ]

}



operation Result {

    input: Vec,

    output: Some

}



operation Option {

    input: Vec,

    output: None

}



@error("client")

structure CollidingError {

codegen/src/main/kotlin/software/amazon/smithy/rust/codegen/smithy/generators/BuilderGenerator.kt

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ class BuilderGenerator( 
        val fallibleBuilder = StructureGenerator.fallibleBuilder(shape, symbolProvider)

        val outputSymbol = symbolProvider.toSymbol(shape)

        val returnType = when (fallibleBuilder) {

            true -> "Result<${implBlockWriter.format(outputSymbol)}, ${implBlockWriter.format(runtimeConfig.operationBuildError())}>"

            true -> "std::result::Result<${implBlockWriter.format(outputSymbol)}, ${implBlockWriter.format(runtimeConfig.operationBuildError())}>"

            false -> implBlockWriter.format(outputSymbol)

        }

        implBlockWriter.docs("Consumes the builder and constructs a #D", outputSymbol)

codegen/src/main/kotlin/software/amazon/smithy/rust/codegen/smithy/generators/FluentClientDecorator.kt

+7 −7
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ class FluentClientGenerator(protocolConfig: ProtocolConfig) { 
                        Self { handle, inner: Default::default() }

                    }



                    pub async fn send(self) -> Result<#{ok}, #{sdk_err}<#{operation_err}>> where

                    pub async fn send(self) -> std::result::Result<#{ok}, #{sdk_err}<#{operation_err}>> where

                        R::Policy: #{client}::bounds::SmithyRetryPolicy<#{input}OperationOutputAlias, #{ok}, #{operation_err}, #{input}OperationRetryAlias>,

                    {

                        let input = self.inner.build().map_err(|err|#{sdk_err}::ConstructionFailure(err.into()))?;

codegen/src/main/kotlin/software/amazon/smithy/rust/codegen/smithy/generators/HttpProtocolGenerator.kt

+2 −2
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ abstract class HttpProtocolGenerator( 
    protected fun httpBuilderFun(implBlockWriter: RustWriter, f: RustWriter.() -> Unit) {

        Attribute.Custom("allow(clippy::unnecessary_wraps)").render(implBlockWriter)

        implBlockWriter.rustBlock(

            "fn request_builder_base(&self) -> Result<#T, #T>",

            "fn request_builder_base(&self) -> std::result::Result<#T, #T>",

            RuntimeType.HttpRequestBuilder, buildErrorT

        ) {

            f(this)
@@ -180,7 +180,7 @@ abstract class HttpProtocolGenerator( 
        val sdkBody = RuntimeType.sdkBody(runtimeConfig)



        val baseReturnType = buildOperationType(implBlockWriter, shape, features)

        val returnType = "Result<$baseReturnType, ${implBlockWriter.format(runtimeConfig.operationBuildError())}>"

        val returnType = "std::result::Result<$baseReturnType, ${implBlockWriter.format(runtimeConfig.operationBuildError())}>"



        implBlockWriter.docs("Consumes the builder and constructs an Operation<#D>", outputSymbol)

        // For codegen simplicity, allow `let x = ...; x`