Merge branch 'main' into no_once_cell (b9010a45) · Commits · Public Repositories / Smithy Rust

.changelog/unknown-variants.md

0 → 100644

+10 −0

Original line number	Diff line number	Diff line
		---
		applies_to: ["client", "server"]
		authors: ["rcoh"]
		references: ["smithy-rs#4132"]
		breaking: false
		new_feature: false
		bug_fix: true
		---

		Smithy unions that contain members named "unknown" will now codegen correctly

aws/rust-runtime/Cargo.lock

+6 −6

Original line number	Diff line number	Diff line
		@@ -580,18 +580,18 @@ dependencies = [

		[[package]]
		name = "clap"
		version = "4.5.37"
		version = "4.5.38"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "eccb054f56cbd38340b380d4a8e69ef1f02f1af43db2f0cc817a4774d80ae071"
		checksum = "ed93b9805f8ba930df42c2590f05453d5ec36cbb85d018868a5b24d31f6ac000"
		dependencies = [
		"clap_builder",
		]

		[[package]]
		name = "clap_builder"
		version = "4.5.37"
		version = "4.5.38"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "efd9466fac8543255d3b1fcad4762c5e116ffe808c8a3043d4263cd4fd4862a2"
		checksum = "379026ff283facf611b0ea629334361c4211d1b12ee01024eec1591133b04120"
		dependencies = [
		"anstyle",
		"clap_lex",
		@@ -2314,9 +2314,9 @@ dependencies = [

		[[package]]
		name = "tempfile"
		version = "3.19.1"
		version = "3.20.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "7437ac7763b9b123ccf33c338a5cc1bac6f69b45a136c19bdd8a65e3916435bf"
		checksum = "e8a64e3985349f2441a1a9ef0b853f869006c3855f2cda6862a94d26ebb9d6a1"
		dependencies = [
		"fastrand",
		"getrandom 0.3.3",

aws/rust-runtime/aws-config/Cargo.lock

+79 −15

Original line number	Diff line number	Diff line
		@@ -406,7 +406,7 @@ dependencies = [
		"miniz_oxide",
		"object",
		"rustc-demangle",
		"windows-targets",
		"windows-targets 0.52.6",
		]

		[[package]]
		@@ -1209,12 +1209,12 @@ checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa"

		[[package]]
		name = "libloading"
		version = "0.8.6"
		version = "0.8.7"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34"
		checksum = "6a793df0d7afeac54f95b471d3af7f0d4fb975699f972341a4b76988d49cdf0c"
		dependencies = [
		"cfg-if",
		"windows-targets",
		"windows-targets 0.53.0",
		]

		[[package]]
		@@ -1404,7 +1404,7 @@ dependencies = [
		"libc",
		"redox_syscall",
		"smallvec",
		"windows-targets",
		"windows-targets 0.52.6",
		]

		[[package]]
		@@ -2254,7 +2254,7 @@ version = "0.52.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
		dependencies = [
		"windows-targets",
		"windows-targets 0.52.6",
		]

		[[package]]
		@@ -2263,7 +2263,7 @@ version = "0.59.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
		dependencies = [
		"windows-targets",
		"windows-targets 0.52.6",
		]

		[[package]]
		@@ -2272,14 +2272,30 @@ version = "0.52.6"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
		dependencies = [
		"windows_aarch64_gnullvm",
		"windows_aarch64_msvc",
		"windows_i686_gnu",
		"windows_i686_gnullvm",
		"windows_i686_msvc",
		"windows_x86_64_gnu",
		"windows_x86_64_gnullvm",
		"windows_x86_64_msvc",
		"windows_aarch64_gnullvm 0.52.6",
		"windows_aarch64_msvc 0.52.6",
		"windows_i686_gnu 0.52.6",
		"windows_i686_gnullvm 0.52.6",
		"windows_i686_msvc 0.52.6",
		"windows_x86_64_gnu 0.52.6",
		"windows_x86_64_gnullvm 0.52.6",
		"windows_x86_64_msvc 0.52.6",
		]

		[[package]]
		name = "windows-targets"
		version = "0.53.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "b1e4c7e8ceaaf9cb7d7507c974735728ab453b67ef8f18febdd7c11fe59dca8b"
		dependencies = [
		"windows_aarch64_gnullvm 0.53.0",
		"windows_aarch64_msvc 0.53.0",
		"windows_i686_gnu 0.53.0",
		"windows_i686_gnullvm 0.53.0",
		"windows_i686_msvc 0.53.0",
		"windows_x86_64_gnu 0.53.0",
		"windows_x86_64_gnullvm 0.53.0",
		"windows_x86_64_msvc 0.53.0",
		]

		[[package]]
		@@ -2288,48 +2304,96 @@ version = "0.52.6"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"

		[[package]]
		name = "windows_aarch64_gnullvm"
		version = "0.53.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764"

		[[package]]
		name = "windows_aarch64_msvc"
		version = "0.52.6"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"

		[[package]]
		name = "windows_aarch64_msvc"
		version = "0.53.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c"

		[[package]]
		name = "windows_i686_gnu"
		version = "0.52.6"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"

		[[package]]
		name = "windows_i686_gnu"
		version = "0.53.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3"

		[[package]]
		name = "windows_i686_gnullvm"
		version = "0.52.6"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"

		[[package]]
		name = "windows_i686_gnullvm"
		version = "0.53.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11"

		[[package]]
		name = "windows_i686_msvc"
		version = "0.52.6"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"

		[[package]]
		name = "windows_i686_msvc"
		version = "0.53.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d"

		[[package]]
		name = "windows_x86_64_gnu"
		version = "0.52.6"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"

		[[package]]
		name = "windows_x86_64_gnu"
		version = "0.53.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba"

		[[package]]
		name = "windows_x86_64_gnullvm"
		version = "0.52.6"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"

		[[package]]
		name = "windows_x86_64_gnullvm"
		version = "0.53.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57"

		[[package]]
		name = "windows_x86_64_msvc"
		version = "0.52.6"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"

		[[package]]
		name = "windows_x86_64_msvc"
		version = "0.53.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"

		[[package]]
		name = "wit-bindgen-rt"
		version = "0.39.0"

aws/sdk/Cargo.lock

+74 −10

Original line number	Diff line number	Diff line
		@@ -1777,18 +1777,18 @@ dependencies = [

		[[package]]
		name = "clap"
		version = "4.5.37"
		version = "4.5.38"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "eccb054f56cbd38340b380d4a8e69ef1f02f1af43db2f0cc817a4774d80ae071"
		checksum = "ed93b9805f8ba930df42c2590f05453d5ec36cbb85d018868a5b24d31f6ac000"
		dependencies = [
		"clap_builder",
		]

		[[package]]
		name = "clap_builder"
		version = "4.5.37"
		version = "4.5.38"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "efd9466fac8543255d3b1fcad4762c5e116ffe808c8a3043d4263cd4fd4862a2"
		checksum = "379026ff283facf611b0ea629334361c4211d1b12ee01024eec1591133b04120"
		dependencies = [
		"anstyle",
		"clap_lex",
		@@ -2954,12 +2954,12 @@ checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa"

		[[package]]
		name = "libloading"
		version = "0.8.6"
		version = "0.8.7"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34"
		checksum = "6a793df0d7afeac54f95b471d3af7f0d4fb975699f972341a4b76988d49cdf0c"
		dependencies = [
		"cfg-if",
		"windows-targets 0.52.6",
		"windows-targets 0.53.0",
		]

		[[package]]
		@@ -4240,9 +4240,9 @@ dependencies = [

		[[package]]
		name = "tempfile"
		version = "3.19.1"
		version = "3.20.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "7437ac7763b9b123ccf33c338a5cc1bac6f69b45a136c19bdd8a65e3916435bf"
		checksum = "e8a64e3985349f2441a1a9ef0b853f869006c3855f2cda6862a94d26ebb9d6a1"
		dependencies = [
		"fastrand 2.3.0",
		"getrandom 0.3.3",
		@@ -4896,13 +4896,29 @@ dependencies = [
		"windows_aarch64_gnullvm 0.52.6",
		"windows_aarch64_msvc 0.52.6",
		"windows_i686_gnu 0.52.6",
		"windows_i686_gnullvm",
		"windows_i686_gnullvm 0.52.6",
		"windows_i686_msvc 0.52.6",
		"windows_x86_64_gnu 0.52.6",
		"windows_x86_64_gnullvm 0.52.6",
		"windows_x86_64_msvc 0.52.6",
		]

		[[package]]
		name = "windows-targets"
		version = "0.53.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "b1e4c7e8ceaaf9cb7d7507c974735728ab453b67ef8f18febdd7c11fe59dca8b"
		dependencies = [
		"windows_aarch64_gnullvm 0.53.0",
		"windows_aarch64_msvc 0.53.0",
		"windows_i686_gnu 0.53.0",
		"windows_i686_gnullvm 0.53.0",
		"windows_i686_msvc 0.53.0",
		"windows_x86_64_gnu 0.53.0",
		"windows_x86_64_gnullvm 0.53.0",
		"windows_x86_64_msvc 0.53.0",
		]

		[[package]]
		name = "windows_aarch64_gnullvm"
		version = "0.48.5"
		@@ -4915,6 +4931,12 @@ version = "0.52.6"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"

		[[package]]
		name = "windows_aarch64_gnullvm"
		version = "0.53.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764"

		[[package]]
		name = "windows_aarch64_msvc"
		version = "0.48.5"
		@@ -4927,6 +4949,12 @@ version = "0.52.6"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"

		[[package]]
		name = "windows_aarch64_msvc"
		version = "0.53.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c"

		[[package]]
		name = "windows_i686_gnu"
		version = "0.48.5"
		@@ -4939,12 +4967,24 @@ version = "0.52.6"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"

		[[package]]
		name = "windows_i686_gnu"
		version = "0.53.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3"

		[[package]]
		name = "windows_i686_gnullvm"
		version = "0.52.6"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"

		[[package]]
		name = "windows_i686_gnullvm"
		version = "0.53.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11"

		[[package]]
		name = "windows_i686_msvc"
		version = "0.48.5"
		@@ -4957,6 +4997,12 @@ version = "0.52.6"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"

		[[package]]
		name = "windows_i686_msvc"
		version = "0.53.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d"

		[[package]]
		name = "windows_x86_64_gnu"
		version = "0.48.5"
		@@ -4969,6 +5015,12 @@ version = "0.52.6"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"

		[[package]]
		name = "windows_x86_64_gnu"
		version = "0.53.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba"

		[[package]]
		name = "windows_x86_64_gnullvm"
		version = "0.48.5"
		@@ -4981,6 +5033,12 @@ version = "0.52.6"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"

		[[package]]
		name = "windows_x86_64_gnullvm"
		version = "0.53.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57"

		[[package]]
		name = "windows_x86_64_msvc"
		version = "0.48.5"
		@@ -4993,6 +5051,12 @@ version = "0.52.6"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"

		[[package]]
		name = "windows_x86_64_msvc"
		version = "0.53.0"
		source = "registry+https://github.com/rust-lang/crates.io-index"
		checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"

		[[package]]
		name = "wit-bindgen"
		version = "0.19.2"

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

+6 −2

Original line number	Diff line number	Diff line
		@@ -110,7 +110,8 @@ open class UnionGenerator(
		private fun renderImplBlock(unionSymbol: Symbol) {
		writer.rustBlock("impl ${unionSymbol.name}") {
		sortedMembers.forEach { member ->
		val funcNamePart = member.memberName.toSnakeCase()
		// We need to get the symbol first because the member can be renamed
		val funcNamePart = symbolProvider.toSymbol(member).name.toSnakeCase()
		val variantName = symbolProvider.toMemberName(member)

		if (sortedMembers.size == 1) {
		@@ -219,7 +220,10 @@ private fun RustWriter.renderAsVariant(
		targetSymbol,
		)
		rust("/// Returns `Err(&Self)` if it can't be converted.")
		rustBlockTemplate("pub fn as_$funcNamePart(&self) -> #{Result}<&${memberSymbol.rustType().render()}, &Self>", *preludeScope) {
		rustBlockTemplate(
		"pub fn as_$funcNamePart(&self) -> #{Result}<&${memberSymbol.rustType().render()}, &Self>",
		*preludeScope,
		) {
		rustTemplate(
		"if let ${unionSymbol.name}::$variantName(val) = &self { #{Ok}(val) } else { #{Err}(self) }",
		*preludeScope,