Add Eq for generated types that implement PartialEq

smithy-lang · Oct 7, 2022 · 5169bd9 · 5169bd9
1 parent 3da634a
commit 5169bd9
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/.../kotlin/software/amazon/smithy/rust/codegen/client/smithy/StreamingTraitSymbolProvider.kt b/.../kotlin/software/amazon/smithy/rust/codegen/client/smithy/StreamingTraitSymbolProvider.kt
@@ -74,14 +74,14 @@ class StreamingShapeMetadataProvider(
     override fun structureMeta(structureShape: StructureShape): RustMetadata {
         val baseMetadata = base.toSymbol(structureShape).expectRustMetadata()
         return if (structureShape.hasStreamingMember(model)) {
-            baseMetadata.withoutDerives(RuntimeType.Clone, RuntimeType.PartialEq)
+            baseMetadata.withoutDerives(RuntimeType.Clone, RuntimeType.PartialEq, RuntimeType.Eq)
         } else baseMetadata
     }
 
     override fun unionMeta(unionShape: UnionShape): RustMetadata {
         val baseMetadata = base.toSymbol(unionShape).expectRustMetadata()
         return if (unionShape.hasStreamingMember(model)) {
-            baseMetadata.withoutDerives(RuntimeType.Clone, RuntimeType.PartialEq)
+            baseMetadata.withoutDerives(RuntimeType.Clone, RuntimeType.PartialEq, RuntimeType.Eq)
         } else baseMetadata
     }
 

diff --git a/codegen-core/src/main/kotlin/software/amazon/smithy/rust/codegen/core/smithy/RuntimeType.kt b/codegen-core/src/main/kotlin/software/amazon/smithy/rust/codegen/core/smithy/RuntimeType.kt
@@ -198,6 +198,7 @@ data class RuntimeType(val name: String?, val dependency: RustDependency?, val n
         val From = RuntimeType("From", dependency = null, namespace = "std::convert")
         val TryFrom = RuntimeType("TryFrom", dependency = null, namespace = "std::convert")
         val PartialEq = std.member("cmp::PartialEq")
+        val Eq = std.member("cmp::Eq")
         val StdError = RuntimeType("Error", dependency = null, namespace = "std::error")
         val String = RuntimeType("String", dependency = null, namespace = "std::string")
 

diff --git a/...src/main/kotlin/software/amazon/smithy/rust/codegen/core/smithy/SymbolMetadataProvider.kt b/...src/main/kotlin/software/amazon/smithy/rust/codegen/core/smithy/SymbolMetadataProvider.kt
@@ -131,7 +131,7 @@ class BaseSymbolMetadataProvider(
     companion object {
         private val defaultDerives by lazy {
             with(RuntimeType) {
-                listOf(Debug, PartialEq, Clone)
+                listOf(Debug, PartialEq, Eq, Clone)
             }
         }
     }

diff --git a/...ain/kotlin/software/amazon/smithy/rust/codegen/core/smithy/generators/BuilderGenerator.kt b/...ain/kotlin/software/amazon/smithy/rust/codegen/core/smithy/generators/BuilderGenerator.kt
@@ -160,7 +160,7 @@ class BuilderGenerator(
         writer.docs("A builder for #D.", structureSymbol)
         // Matching derives to the main structure + `Default` since we are a builder and everything is optional.
         val baseDerives = structureSymbol.expectRustMetadata().derives
-        val derives = baseDerives.derives.intersect(setOf(RuntimeType.Debug, RuntimeType.PartialEq, RuntimeType.Clone)) + RuntimeType.Default
+        val derives = baseDerives.derives.intersect(setOf(RuntimeType.Debug, RuntimeType.PartialEq, RuntimeType.Eq, RuntimeType.Clone)) + RuntimeType.Default
         baseDerives.copy(derives = derives).render(writer)
         writer.rustBlock("pub struct $builderName") {
             for (member in members) {

diff --git a/...in/software/amazon/smithy/rust/codegen/server/python/smithy/PythonServerSymbolProvider.kt b/...in/software/amazon/smithy/rust/codegen/server/python/smithy/PythonServerSymbolProvider.kt
@@ -95,14 +95,14 @@ class PythonStreamingShapeMetadataProvider(private val base: RustSymbolProvider,
     override fun structureMeta(structureShape: StructureShape): RustMetadata {
         val baseMetadata = base.toSymbol(structureShape).expectRustMetadata()
         return if (structureShape.hasStreamingMember(model)) {
-            baseMetadata.withoutDerives(RuntimeType.PartialEq)
+            baseMetadata.withoutDerives(RuntimeType.PartialEq, RuntimeType.Eq)
         } else baseMetadata
     }
 
     override fun unionMeta(unionShape: UnionShape): RustMetadata {
         val baseMetadata = base.toSymbol(unionShape).expectRustMetadata()
         return if (unionShape.hasStreamingMember(model)) {
-            baseMetadata.withoutDerives(RuntimeType.PartialEq)
+            baseMetadata.withoutDerives(RuntimeType.PartialEq, RuntimeType.Eq)
         } else baseMetadata
     }