pre-commit

Author: thomas-k-cameron

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

@@ -19,9 +19,6 @@ base64-simd = "0.8"
 version = "1"
 features = ["derive"]
 
-[target."cfg(aws_sdk_unstable)".dependencies.base64]
-version = "0.21.0"
-
 [dev-dependencies]
 base64 = "0.13.0"
 lazy_static = "1.4"

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

@@ -8,6 +8,8 @@ use serde::Serialize;
 #[cfg(all(aws_sdk_unstable, feature = "serde-deserialize"))]
 use serde::{de::Visitor, Deserialize};
 
+use crate::base64;
+
 /// Binary Blob Type
 ///
 /// Blobs represent protocol-agnostic binary content.
@@ -104,11 +106,15 @@ impl<'de> Deserialize<'de> for Blob {
 }
 
 #[cfg(test)]
-#[cfg(all(aws_sdk_unstable, feature = "serde-serialize", feature = "serde-deserialize"))]
+#[cfg(all(
+    aws_sdk_unstable,
+    feature = "serde-serialize",
+    feature = "serde-deserialize"
+))]
 mod test {
     use crate::Blob;
-    use std::collections::HashMap;
     use serde::{Deserialize, Serialize};
+    use std::collections::HashMap;
 
     #[derive(Deserialize, Serialize, Debug, PartialEq)]
     struct ForTest {

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

@@ -557,7 +557,12 @@ mod test {
         );
     }
 
-    #[cfg(all(test, aws_sdk_unstable, feature = "serde-deserialize", feature = "serde-serialize"))]
+    #[cfg(all(
+        test,
+        aws_sdk_unstable,
+        feature = "serde-deserialize",
+        feature = "serde-serialize"
+    ))]
     #[test]
     fn human_readable_datetime() {
         use serde::{Deserialize, Serialize};
@@ -576,7 +581,12 @@ mod test {
     }
 
     /// checks that they are serialized into tuples
-    #[cfg(all(test, aws_sdk_unstable, feature = "serde-deserialize", feature = "serde-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,8 +4,6 @@
  */
 
 use crate::Number;
-use serde::Deserialize;
-use serde::Serialize;
 use std::collections::HashMap;
 
 /* ANCHOR: document */
@@ -17,8 +15,14 @@ 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 = "serde-serialize"), derive(serde::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(
+    all(aws_sdk_unstable, feature = "serde-deserialize"),
+    derive(serde::Deserialize)
+)]
 #[cfg_attr(
     any(
         all(aws_sdk_unstable, feature = "serde-deserialize"),
@@ -87,13 +91,13 @@ impl From<i32> for Document {
 
 #[cfg(test)]
 mod test {
-    use crate::Document;
-    use crate::Number;
-    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 = "serde-serialize", feature = "serde-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/error/metadata.rs

@@ -40,8 +40,14 @@ pub const EMPTY_ERROR_METADATA: ErrorMetadata = ErrorMetadata {
 /// For many services, Errors are modeled. However, many services only partially model errors or don't
 /// model errors at all. In these cases, the SDK will return this generic error type to expose the
 /// `code`, `message` and `request_id`.
-#[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(
+    all(aws_sdk_unstable, feature = "serde-serialize"),
+    derive(serde::Serialize)
+)]
+#[cfg_attr(
+    all(aws_sdk_unstable, feature = "serde-deserialize"),
+    derive(serde::Deserialize)
+)]
 #[derive(Debug, Eq, PartialEq, Default, Clone)]
 pub struct ErrorMetadata {
     code: Option<String>,

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

@@ -7,14 +7,23 @@
 //! <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")))]
+#[cfg(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 = "serde-deserialize"), derive(serde::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(
+    all(aws_sdk_unstable, feature = "serde-serialize"),
+    derive(serde::Serialize)
+)]
 #[cfg_attr(
     any(
         all(aws_sdk_unstable, feature = "serde-deserialize"),
@@ -457,7 +466,12 @@ mod test {
     }
 
     #[test]
-    #[cfg(all(test, aws_sdk_unstable, feature = "serde-deserialize", feature = "serde-serialize"))]
+    #[cfg(all(
+        test,
+        aws_sdk_unstable,
+        feature = "serde-deserialize",
+        feature = "serde-serialize"
+    ))]
     /// ensures that numbers are deserialized as expected
     /// 0 <= PosInt
     /// 0 > NegInt