Merge commit '40500c9d2139699b14a34d80873c718ba52a8a8e'

thomas-k-cameron · thomas-k-cameron · commit c771f997c25f · 2023-04-19T02:53:59.000Z
diff --git a/codegen-core/src/main/kotlin/software/amazon/smithy/rust/codegen/core/smithy/generators/CargoTomlGenerator.kt b/codegen-core/src/main/kotlin/software/amazon/smithy/rust/codegen/core/smithy/generators/CargoTomlGenerator.kt
@@ -81,6 +81,11 @@ class CargoTomlGenerator(
             "features" to cargoFeatures.toMap(),
         ).deepMergeWith(manifestCustomizations)
 
-        writer.writeWithNoFormatting(TomlWriter().write(cargoToml))
+        // NOTE: without this it will produce ["target.'cfg(aws_sdk_unstable)'.dependencies"]
+        // In JSON, this is an equivalent of: {"target.'cfg(aws_sdk_unstable)'.dependencies" : ...}
+        // To make it work, it has to be: {"target": {'cfg(aws_sdk_unstable)': {"dependencies": ...}}}
+        // This piece of code fixes it.
+        var tomlString = TomlWriter().write(cargoToml).replace("\"target.'cfg(aws_sdk_unstable)'.dependencies\"", "target.'cfg(aws_sdk_unstable)'.dependencies")
+        writer.writeWithNoFormatting(tomlString)
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,11 @@ class CargoTomlGenerator(`
`81`	`81`	`"features" to cargoFeatures.toMap(),`
`82`	`82`	`).deepMergeWith(manifestCustomizations)`
`83`	`83`
`84`		`- writer.writeWithNoFormatting(TomlWriter().write(cargoToml))`
	`84`	`+ // NOTE: without this it will produce ["target.'cfg(aws_sdk_unstable)'.dependencies"]`
	`85`	`+ // In JSON, this is an equivalent of: {"target.'cfg(aws_sdk_unstable)'.dependencies" : ...}`
	`86`	`+ // To make it work, it has to be: {"target": {'cfg(aws_sdk_unstable)': {"dependencies": ...}}}`
	`87`	`+ // This piece of code fixes it.`
	`88`	`+ var tomlString = TomlWriter().write(cargoToml).replace("\"target.'cfg(aws_sdk_unstable)'.dependencies\"", "target.'cfg(aws_sdk_unstable)'.dependencies")`
	`89`	`+ writer.writeWithNoFormatting(tomlString)`
`85`	`90`	`}`
`86`	`91`	`}`