Merge conflicts from 3d00767 have been resolved

Author: Fahad Zubair

codegen-client/src/test/kotlin/software/amazon/smithy/rust/codegen/client/smithy/protocols/eventstream/ClientEventStreamBaseRequirements.kt

@@ -68,23 +68,6 @@ abstract class ClientEventStreamBaseRequirements : EventStreamTestRequirements<C
         symbolProvider: RustSymbolProvider,
         operationOrEventStream: Shape,
     ) {
-        OperationErrorGenerator(model, symbolProvider, operationOrEventStream, emptyList()).render(writer)
-    }
-
-    override fun renderError(
-        rustCrate: RustCrate,
-        writer: RustWriter,
-        codegenContext: ClientCodegenContext,
-        shape: StructureShape,
-    ) {
-        val errorTrait = shape.expectTrait<ErrorTrait>()
-        ErrorGenerator(
-            codegenContext.model,
-            codegenContext.symbolProvider,
-            writer,
-            shape,
-            errorTrait,
-            emptyList(),
-        ).render()
+        OperationErrorGenerator(model, symbolProvider, operationOrEventStream).render(writer)
     }
 }

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

@@ -42,6 +42,17 @@ fun RustWriter.implBlock(structureShape: Shape, symbolProvider: SymbolProvider,
     }
 }
 
+/**
+ * This is a fun that has been introduced in commit d47778e (Implement RequestID).
+ * Copied it here to make the current code compatible.
+ * Write an `impl` block for the given symbol
+ * */
+fun RustWriter.implBlock(symbol: Symbol, block: Writable) {
+    rustBlock("impl ${symbol.name}") {
+        block()
+    }
+}
+
 open class StructureGenerator(
     val model: Model,
     private val symbolProvider: RustSymbolProvider,

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

@@ -77,9 +77,6 @@ interface EventStreamTestRequirements<C : CodegenContext> {
         symbolProvider: RustSymbolProvider,
         operationOrEventStream: Shape,
     )
-
-    /** Render an error struct and builder */
-    fun renderError(rustCrate: RustCrate, writer: RustWriter, codegenContext: C, shape: StructureShape)
 }
 
 object EventStreamTestTools {
@@ -135,7 +132,8 @@ object EventStreamTestTools {
             requirements.renderOperationError(this, model, symbolProvider, operationShape)
             requirements.renderOperationError(this, model, symbolProvider, unionShape)
             for (shape in errors) {
-                requirements.renderError(project, this, codegenContext, shape)
+                StructureGenerator(model, symbolProvider, this, shape).render(codegenTarget)
+                requirements.renderBuilderForShape(project, this, codegenContext, shape)
             }
         }
         val inputOutput = model.lookup<StructureShape>("test#TestStreamInputOutput")

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

@@ -12,7 +12,6 @@ import software.amazon.smithy.model.shapes.ServiceShape
 import software.amazon.smithy.model.shapes.ShapeId
 import software.amazon.smithy.model.shapes.StructureShape
 import software.amazon.smithy.rust.codegen.core.rustlang.RustWriter
-import software.amazon.smithy.rust.codegen.core.smithy.CodegenTarget
 import software.amazon.smithy.rust.codegen.core.smithy.RuntimeConfig
 import software.amazon.smithy.rust.codegen.core.smithy.RustCrate
 import software.amazon.smithy.rust.codegen.core.smithy.RustSymbolProvider
@@ -122,7 +121,7 @@ fun serverTestCodegenContext(
  * In tests, we frequently need to generate a struct, a builder, and an impl block to access said builder.
  */
 fun StructureShape.serverRenderWithModelBuilder(rustCrate: RustCrate, model: Model, symbolProvider: RustSymbolProvider, writer: RustWriter) {
-    StructureGenerator(model, symbolProvider, writer, this, emptyList()).render()
+    StructureGenerator(model, symbolProvider, writer, this).render()
     val serverCodegenContext = serverTestCodegenContext(model)
     // Note that this always uses `ServerBuilderGenerator` and _not_ `ServerBuilderGeneratorWithoutPublicConstrainedTypes`,
     // regardless of the `publicConstrainedTypes` setting.

codegen-server/src/test/kotlin/software/amazon/smithy/rust/codegen/server/smithy/generators/ServerBuilderGeneratorTest.kt

@@ -7,9 +7,9 @@ package software.amazon.smithy.rust.codegen.server.smithy.generators
 
 import org.junit.jupiter.api.Test
 import software.amazon.smithy.model.shapes.StructureShape
-import software.amazon.smithy.rust.codegen.core.rustlang.implBlock
 import software.amazon.smithy.rust.codegen.core.rustlang.rust
 import software.amazon.smithy.rust.codegen.core.smithy.generators.StructureGenerator
+import software.amazon.smithy.rust.codegen.core.smithy.generators.implBlock
 import software.amazon.smithy.rust.codegen.core.testutil.TestWorkspace
 import software.amazon.smithy.rust.codegen.core.testutil.asSmithyModel
 import software.amazon.smithy.rust.codegen.core.testutil.compileAndTest
@@ -44,7 +44,7 @@ class ServerBuilderGeneratorTest {
             val writer = this
             val shape = model.lookup<StructureShape>("test#Credentials")
 
-            StructureGenerator(model, codegenContext.symbolProvider, writer, shape, emptyList()).render()
+            StructureGenerator(model, codegenContext.symbolProvider, writer, shape).render()
             val builderGenerator = ServerBuilderGenerator(
                 codegenContext,
                 shape,

codegen-server/src/test/kotlin/software/amazon/smithy/rust/codegen/server/smithy/protocols/eventstream/ServerEventStreamBaseRequirements.kt

@@ -97,22 +97,4 @@ abstract class ServerEventStreamBaseRequirements : EventStreamTestRequirements<S
     ) {
         ServerOperationErrorGenerator(model, symbolProvider, operationOrEventStream).render(writer)
     }
-
-    override fun renderError(
-        rustCrate: RustCrate,
-        writer: RustWriter,
-        codegenContext: ServerCodegenContext,
-        shape: StructureShape,
-    ) {
-        StructureGenerator(codegenContext.model, codegenContext.symbolProvider, writer, shape, listOf()).render()
-        ErrorImplGenerator(
-            codegenContext.model,
-            codegenContext.symbolProvider,
-            writer,
-            shape,
-            shape.getTrait()!!,
-            listOf(),
-        ).render(CodegenTarget.SERVER)
-        renderBuilderForShape(rustCrate, writer, codegenContext, shape)
-    }
 }