1. Fixes feature-gate name for aws_smithy_types for serde

2.

Author: thomas-k-cameron

rust-runtime/aws-smithy-types/Cargo.toml

@@ -14,10 +14,13 @@ ryu = "1.0.5"
 time = { version = "0.3.4", features = ["parsing"] }
 base64-simd = "0.8"
 
-[target.'cfg(aws_sdk_unstable)'.dependencies.serde]
+
+[target."cfg(aws_sdk_unstable)".dependencies.serde]
 version = "1"
 features = ["derive"]
-optional = true
+
+[target."cfg(aws_sdk_unstable)".dependencies.base64]
+version = "0.21.0"
 
 [dev-dependencies]
 base64 = "0.13.0"

rust-runtime/aws-smithy-types/src/blob.rs

@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#[cfg(all(aws_sdk_unstable, feature = "serialize"))]
+#[cfg(all(aws_sdk_unstable, feature = "serde-serialize"))]
 use serde::Serialize;
-#[cfg(all(aws_sdk_unstable, feature = "deserialize"))]
+#[cfg(all(aws_sdk_unstable, feature = "serde-deserialize"))]
 use serde::{de::Visitor, Deserialize};
 
 /// Binary Blob Type
@@ -36,7 +36,7 @@ impl AsRef<[u8]> for Blob {
     }
 }
 
-#[cfg(all(aws_sdk_unstable, feature = "serialize"))]
+#[cfg(all(aws_sdk_unstable, feature = "serde-serialize"))]
 impl Serialize for Blob {
     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
     where
@@ -50,10 +50,10 @@ impl Serialize for Blob {
     }
 }
 
-#[cfg(all(aws_sdk_unstable, feature = "deserialize"))]
+#[cfg(all(aws_sdk_unstable, feature = "serde-deserialize"))]
 struct HumanReadableBlobVisitor;
 
-#[cfg(all(aws_sdk_unstable, feature = "deserialize"))]
+#[cfg(all(aws_sdk_unstable, feature = "serde-deserialize"))]
 impl<'de> Visitor<'de> for HumanReadableBlobVisitor {
     type Value = Blob;
     fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
@@ -71,10 +71,10 @@ impl<'de> Visitor<'de> for HumanReadableBlobVisitor {
     }
 }
 
-#[cfg(all(aws_sdk_unstable, feature = "deserialize"))]
+#[cfg(all(aws_sdk_unstable, feature = "serde-deserialize"))]
 struct NotHumanReadableBlobVisitor;
 
-#[cfg(all(aws_sdk_unstable, feature = "deserialize"))]
+#[cfg(all(aws_sdk_unstable, feature = "serde-deserialize"))]
 impl<'de> Visitor<'de> for NotHumanReadableBlobVisitor {
     type Value = Blob;
     fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
@@ -89,7 +89,7 @@ impl<'de> Visitor<'de> for NotHumanReadableBlobVisitor {
     }
 }
 
-#[cfg(all(aws_sdk_unstable, feature = "deserialize"))]
+#[cfg(all(aws_sdk_unstable, feature = "serde-deserialize"))]
 impl<'de> Deserialize<'de> for Blob {
     fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
     where
@@ -104,16 +104,12 @@ impl<'de> Deserialize<'de> for Blob {
 }
 
 #[cfg(test)]
-#[cfg(all(aws_sdk_unstable, feature = "serialize", feature = "deserialize"))]
+#[cfg(all(aws_sdk_unstable, feature = "serde-serialize", feature = "serde-deserialize"))]
 mod test {
-    #[cfg(all(aws_sdk_unstable, feature = "serialize", feature = "deserialize"))]
     use crate::Blob;
-    #[cfg(all(aws_sdk_unstable, feature = "serialize", feature = "deserialize"))]
     use std::collections::HashMap;
-
-    #[cfg(all(aws_sdk_unstable, feature = "serialize", feature = "deserialize"))]
     use serde::{Deserialize, Serialize};
-    use std::collections::HashMap;
+
     #[derive(Deserialize, Serialize, Debug, PartialEq)]
     struct ForTest {
         blob: Blob,

rust-runtime/aws-smithy-types/src/date_time/mod.rs

@@ -16,10 +16,10 @@ use std::time::Duration;
 use std::time::SystemTime;
 use std::time::UNIX_EPOCH;
 
-#[cfg(all(test, aws_sdk_unstable, feature = "deserialize"))]
+#[cfg(all(aws_sdk_unstable, feature = "serde-deserialize"))]
 mod de;
 mod format;
-#[cfg(all(test, aws_sdk_unstable, feature = "serialize"))]
+#[cfg(all(aws_sdk_unstable, feature = "serde-serialize"))]
 mod ser;
 
 pub use self::format::DateTimeFormatError;
@@ -557,7 +557,7 @@ mod test {
         );
     }
 
-    #[cfg(all(test, aws_sdk_unstable, feature = "deserialize", feature = "serialize"))]
+    #[cfg(all(test, aws_sdk_unstable, feature = "serde-deserialize", feature = "serde-serialize"))]
     #[test]
     fn human_readable_datetime() {
         use serde::{Deserialize, Serialize};
@@ -576,7 +576,7 @@ mod test {
     }
 
     /// checks that they are serialized into tuples
-    #[cfg(all(test, aws_sdk_unstable, feature = "deserialize", feature = "serialize"))]
+    #[cfg(all(test, aws_sdk_unstable, feature = "serde-deserialize", feature = "serde-serialize"))]
     #[test]
     fn not_human_readable_datetime() {
         let cbor = ciborium::value::Value::Array(vec![

rust-runtime/aws-smithy-types/src/document.rs

@@ -4,9 +4,7 @@
  */
 
 use crate::Number;
-#[cfg(all(aws_sdk_unstable, feature = "deserialize"))]
 use serde::Deserialize;
-#[cfg(all(aws_sdk_unstable, feature = "serialize"))]
 use serde::Serialize;
 use std::collections::HashMap;
 
@@ -19,12 +17,12 @@ use std::collections::HashMap;
 /// modeled using rigid types, or data that has a schema that evolves outside of the purview of a model.
 /// The serialization format of a document is an implementation detail of a protocol.
 #[derive(Debug, Clone, PartialEq)]
-#[cfg_attr(all(aws_sdk_unstable, feature = "serialize"), derive(Serialize))]
-#[cfg_attr(all(aws_sdk_unstable, feature = "deserialize"), derive(Deserialize))]
+#[cfg_attr(all(aws_sdk_unstable, feature = "serde-serialize"), derive(serde::Serialize))]
+#[cfg_attr(all(aws_sdk_unstable, feature = "serde-deserialize"), derive(serde::Deserialize))]
 #[cfg_attr(
     any(
-        all(aws_sdk_unstable, feature = "deserialize"),
-        all(aws_sdk_unstable, feature = "serialize")
+        all(aws_sdk_unstable, feature = "serde-deserialize"),
+        all(aws_sdk_unstable, feature = "serde-serialize")
     ),
     serde(untagged)
 )]
@@ -89,16 +87,13 @@ impl From<i32> for Document {
 
 #[cfg(test)]
 mod test {
-    #[cfg(all(aws_sdk_unstable, feature = "serialize", feature = "deserialize"))]
     use crate::Document;
-    #[cfg(all(aws_sdk_unstable, feature = "serialize", feature = "deserialize"))]
     use crate::Number;
-    #[cfg(all(aws_sdk_unstable, feature = "serialize", feature = "deserialize"))]
     use std::collections::HashMap;
 
     /// checks if a) serialization of json suceeds and b) it is compatible with serde_json
     #[test]
-    #[cfg(all(aws_sdk_unstable, feature = "serialize", feature = "deserialize"))]
+    #[cfg(all(aws_sdk_unstable, feature = "serde-serialize", feature = "serde-deserialize"))]
     fn serialize_json() {
         use crate::Document;
         use crate::Number;

rust-runtime/aws-smithy-types/src/number.rs

@@ -7,16 +7,18 @@
 //! <https://docs.serde.rs/src/serde_json/number.rs.html#20-22>
 
 use crate::error::{TryFromNumberError, TryFromNumberErrorKind};
+#[cfg_attr(all(aws_sdk_unstable, any(feature = "serde-serialize", feature = "serde-deserialize")))]
+use serde;
 
 /// A number type that implements Javascript / JSON semantics, modeled on serde_json:
 /// <https://docs.serde.rs/src/serde_json/number.rs.html#20-22>
 #[derive(Debug, Clone, Copy, PartialEq)]
-#[cfg_attr(all(aws_sdk_unstable, feature = "deserialize"), derive(Deserialize))]
-#[cfg_attr(all(aws_sdk_unstable, feature = "serialize"), derive(Serialize))]
+#[cfg_attr(all(aws_sdk_unstable, feature = "serde-deserialize"), derive(serde::Deserialize))]
+#[cfg_attr(all(aws_sdk_unstable, feature = "serde-serialize"), derive(serde::Serialize))]
 #[cfg_attr(
     any(
-        all(aws_sdk_unstable, feature = "deserialize"),
-        all(aws_sdk_unstable, feature = "serialize")
+        all(aws_sdk_unstable, feature = "serde-deserialize"),
+        all(aws_sdk_unstable, feature = "serde-serialize")
     ),
     serde(untagged)
 )]
@@ -455,7 +457,7 @@ mod test {
     }
 
     #[test]
-    #[cfg(all(test, aws_sdk_unstable, feature = "deserialize", feature = "serialize"))]
+    #[cfg(all(test, aws_sdk_unstable, feature = "serde-deserialize", feature = "serde-serialize"))]
     /// ensures that numbers are deserialized as expected
     /// 0 <= PosInt
     /// 0 > NegInt