Clippy warnings removed on constraints, k.into() if gated

Author: Fahad Zubair

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

@@ -77,6 +77,7 @@ class CollectionConstraintViolationGenerator(
             //  and is for use by the framework.
             rustTemplate(
                 """
+                ##[allow(clippy::enum_variant_names)]
                 ##[derive(Debug, PartialEq)]
                 ${constraintViolationVisibility.toRustQualifier()} enum $constraintViolationName {
                     #{ConstraintViolationVariants:W}

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

@@ -7,6 +7,7 @@ package software.amazon.smithy.rust.codegen.server.smithy.generators
 
 import software.amazon.smithy.codegen.core.Symbol
 import software.amazon.smithy.model.shapes.MapShape
+import software.amazon.smithy.model.shapes.StringShape
 import software.amazon.smithy.model.shapes.StructureShape
 import software.amazon.smithy.model.shapes.UnionShape
 import software.amazon.smithy.model.traits.LengthTrait
@@ -21,6 +22,7 @@ import software.amazon.smithy.rust.codegen.core.smithy.expectRustMetadata
 import software.amazon.smithy.rust.codegen.core.util.expectTrait
 import software.amazon.smithy.rust.codegen.server.smithy.PubCrateConstraintViolationSymbolProvider
 import software.amazon.smithy.rust.codegen.server.smithy.ServerCodegenContext
+import software.amazon.smithy.rust.codegen.server.smithy.typeNameContainsNonPublicType
 
 /**
  * [ConstrainedMapGenerator] generates a wrapper tuple newtype holding a constrained `std::collections::HashMap`.
@@ -130,14 +132,22 @@ class ConstrainedMapGenerator(
             valueShape !is StructureShape &&
             valueShape !is UnionShape
         ) {
+            val keyShape = model.expectShape(shape.key.target, StringShape::class.java)
+            val keyNeedsConversion = keyShape.typeNameContainsNonPublicType(model, symbolProvider, publicConstrainedTypes)
+            val key = if (keyNeedsConversion) {
+                "k.into()"
+            } else {
+                "k"
+            }
+
             writer.rustTemplate(
                 """
                 impl #{From}<$name> for #{FullyUnconstrainedSymbol} {
                     fn from(value: $name) -> Self {
                         value
                             .into_inner()
                             .into_iter()
-                            .map(|(k, v)| (k.into(), v.into()))
+                            .map(|(k, v)| ($key, v.into()))
                             .collect()
                     }
                 }

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

@@ -76,6 +76,7 @@ class MapConstraintViolationGenerator(
             //  and is for use by the framework.
             rustTemplate(
                 """
+                ##[allow(clippy::enum_variant_names)]
                 ##[derive(Debug, PartialEq)]
                 pub${ if (constraintViolationVisibility == Visibility.PUBCRATE) " (crate) " else "" } enum $constraintViolationName {
                     ${if (shape.hasTrait<LengthTrait>()) "Length(usize)," else ""}

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

@@ -71,7 +71,9 @@ class ServerBuilderConstraintViolations(
         writer.docs("Holds one variant for each of the ways the builder can fail.")
         if (nonExhaustive) Attribute.NonExhaustive.render(writer)
         val constraintViolationSymbolName = constraintViolationSymbolProvider.toSymbol(shape).name
-        writer.rustBlock("pub${if (visibility == Visibility.PUBCRATE) " (crate) " else ""} enum $constraintViolationSymbolName") {
+        writer.rustBlock("""
+            ##[allow(clippy::enum_variant_names)]
+            pub${if (visibility == Visibility.PUBCRATE) " (crate) " else ""} enum $constraintViolationSymbolName""") {
             renderConstraintViolations(writer)
         }
 

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

@@ -139,7 +139,9 @@ class UnconstrainedUnionGenerator(
             constraintViolationSymbol
         ) {
             Attribute(derive(RuntimeType.Debug, RuntimeType.PartialEq)).render(this)
-            rustBlock("pub${if (constraintViolationVisibility == Visibility.PUBCRATE) " (crate)" else ""} enum $constraintViolationName") {
+            rustBlock("""
+                ##[allow(clippy::enum_variant_names)]
+                pub${if (constraintViolationVisibility == Visibility.PUBCRATE) " (crate)" else ""} enum $constraintViolationName""") {
                 constraintViolations().forEach { renderConstraintViolation(this, it) }
             }
 

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

@@ -22,7 +22,6 @@ import java.util.*
 import software.amazon.smithy.rust.codegen.core.util.UNREACHABLE
 import software.amazon.smithy.rust.codegen.core.util.orNull
 import software.amazon.smithy.rust.codegen.server.smithy.allConstraintTraits
-import software.amazon.smithy.rust.codegen.server.smithy.transformers.ConstrainedMemberTransform.makeNonConstrained
 
 /**
  * Transforms all member shapes that have constraints on them into equivalent non-constrained
@@ -86,10 +85,8 @@ object ConstrainedMemberTransform {
             .flatMap    { it.constrainedMembers() }
             .mapNotNull {
                 val transformation = it.makeNonConstrained(model, additionalNames)
-                if (transformation != null) {
-                    // Keep record of new names that have been generated to ensure none of them regenerated.
-                    additionalNames.add(transformation.newShape.id)
-                }
+                // Keep record of new names that have been generated to ensure none of them regenerated.
+                additionalNames.add(transformation.newShape.id)
 
                 transformation
             }
@@ -169,31 +166,31 @@ object ConstrainedMemberTransform {
     private fun MemberShape.makeNonConstrained(
         model: Model,
         additionalNames: MutableSet<ShapeId>,
-    ): MemberShapeTransformation? {
-        val (constraintTraits, otherTraits) = this.allTraits.values
+    ): MemberShapeTransformation {
+        val (memberConstraintTraits, otherTraits) = this.allTraits.values
             .partition {
                 memberConstraintTraitsToOverride.contains(it.javaClass)
             }
 
-        // No transformation required in case the member shape has no constraints.
-        if (constraintTraits.isEmpty())
-            return null
+        check(memberConstraintTraits.isNotEmpty()) {
+            "There must at least be one member constraint on the shape"
+        }
 
         // Build a new shape similar to the target of the constrained member shape. It should
         // have all of the original constraints that have not been overridden, and the ones
         // that this member shape overrides.
         val targetShape = model.expectShape(this.target)
         if (targetShape !is ToSmithyBuilder<*>)
-            UNREACHABLE("member target shapes will always be buildable")
+            UNREACHABLE("Member target shapes will always be buildable")
 
         return when (val builder = targetShape.toBuilder()) {
             is AbstractShapeBuilder<*, *> -> {
                 // Use the target builder to create a new standalone shape that would
                 // be added to the model later on. Keep all existing traits on the target
                 // but replace the ones that are overridden on the member shape.
-                val nonOverriddenTraitsOnTarget =
+                val nonOverriddenConstraintTraits =
                     builder.allTraits.values.filter { existingTrait ->
-                        constraintTraits.none { it.toShapeId() == existingTrait.toShapeId() }
+                        memberConstraintTraits.none { it.toShapeId() == existingTrait.toShapeId() }
                     }
 
                 // Add a synthetic constraint on all new shapes being defined, that would link
@@ -203,7 +200,7 @@ object ConstrainedMemberTransform {
 
                 // Combine target traits, overridden traits and the synthetic trait
                 val newTraits =
-                    nonOverriddenTraitsOnTarget + constraintTraits + syntheticTrait
+                    nonOverriddenConstraintTraits + memberConstraintTraits + syntheticTrait
 
                 // Create a new unique standalone shape that will be added to the model later on
                 val shapeId = overriddenShapeId(model, additionalNames, this.id)