diff --git a/codegen/src/main/kotlin/software/amazon/smithy/rust/codegen/rustlang/RustTypes.kt b/codegen/src/main/kotlin/software/amazon/smithy/rust/codegen/rustlang/RustTypes.kt index 8201363f00a1e2bd1332f5b52763948b7804f4ce..45a630be9387cd901400d22055cc86c8fc732baf 100644 --- a/codegen/src/main/kotlin/software/amazon/smithy/rust/codegen/rustlang/RustTypes.kt +++ b/codegen/src/main/kotlin/software/amazon/smithy/rust/codegen/rustlang/RustTypes.kt @@ -68,8 +68,8 @@ sealed class RustType { override val namespace = Namespace companion object { - const val Type = "BTreeSet" - const val Namespace = "std::collections" + const val Type = "Vec" + const val Namespace = "std::vec" val RuntimeType = RuntimeType(name = Type, namespace = Namespace, dependency = null) } } diff --git a/codegen/src/main/kotlin/software/amazon/smithy/rust/codegen/smithy/generators/HttpProtocolTestGenerator.kt b/codegen/src/main/kotlin/software/amazon/smithy/rust/codegen/smithy/generators/HttpProtocolTestGenerator.kt index 13b64e404b0fa7c9bbe7ce9c7476ec50be302243..e9d1dca8171fe90b3831cc96af76976818329c8b 100644 --- a/codegen/src/main/kotlin/software/amazon/smithy/rust/codegen/smithy/generators/HttpProtocolTestGenerator.kt +++ b/codegen/src/main/kotlin/software/amazon/smithy/rust/codegen/smithy/generators/HttpProtocolTestGenerator.kt @@ -422,11 +422,6 @@ class HttpProtocolTestGenerator( // These tests are not even attempted to be compiled, either because they will not compile // or because they are flaky - private val DisableTests = setOf( - // This test is flaky because of set ordering serialization https://github.com/awslabs/smithy-rs/issues/37 - "AwsJson11Enums", - "RestJsonJsonEnums", - "RestJsonLists" - ) + private val DisableTests = setOf() } } diff --git a/codegen/src/main/kotlin/software/amazon/smithy/rust/codegen/smithy/generators/Instantiator.kt b/codegen/src/main/kotlin/software/amazon/smithy/rust/codegen/smithy/generators/Instantiator.kt index 87abb00a73a6de4d32be7a9668e643f7dd0ccfaa..08596166680e880c087fa372ac2272c808cd2c26 100644 --- a/codegen/src/main/kotlin/software/amazon/smithy/rust/codegen/smithy/generators/Instantiator.kt +++ b/codegen/src/main/kotlin/software/amazon/smithy/rust/codegen/smithy/generators/Instantiator.kt @@ -162,23 +162,7 @@ class Instantiator( } private fun renderSet(writer: RustWriter, shape: SetShape, data: ArrayNode, ctx: Ctx) { - if (symbolProvider.toSymbol(shape).rustType() is RustType.HashSet) { - if (!data.isEmpty) { - writer.rustBlock("") { - write("let mut ret = #T::new();", RustType.HashSet.RuntimeType) - data.forEach { v -> - withBlock("ret.insert(", ");") { - renderMember(this, shape.member, v, ctx) - } - } - write("ret") - } - } else { - writer.write("#T::new()", RustType.HashSet.RuntimeType) - } - } else { - renderList(writer, shape, data, ctx) - } + renderList(writer, shape, data, ctx) } /**