Update serde_amqp_derive deps and fix +nightly clippy warnings

fe2o3-amqp-management/src/operations/entity/create.rs

@@ -43,25 +43,25 @@ pub struct CreateRequest<'a> {
     /// attribute value is not string, conversion into the correct type MUST be performed according
     /// to the following rules:
     ///
-    /// • A string that consists solely of characters from the ASCII character-set, will be
+    /// - A string that consists solely of characters from the ASCII character-set, will be
     /// converted into a symbol if so required.
     ///
-    /// • A string that can be parsed as a number according to [RFC7159] will be converted to a
+    /// - A string that can be parsed as a number according to [RFC7159] will be converted to a
     /// ubyte, ushort, uint, ulong, byte, short, int, or long if so required and the number lies
     /// within the domain of the given AMQP type and represents an integral number
     ///
-    /// • A string which can be parsed as a number according to [RFC7159] will be converted to an
+    /// - A string which can be parsed as a number according to [RFC7159] will be converted to an
     /// float, double, decimal32, decimal64 or decimal128 if so required and the number lies within
     /// the domain of the given AMQP type.
     ///
-    /// • A string which can be parsed as true or false according to [RFC7159] will be converted to
+    /// - A string which can be parsed as true or false according to [RFC7159] will be converted to
     /// a boolean value if so required.
     ///
-    /// • A string which can be parsed as an array according to [RFC7159] will be converted into a
+    /// - A string which can be parsed as an array according to [RFC7159] will be converted into a
     /// list (with the values type-converted into elements as necessary according to the same rules)
     /// if so required.
     ///
-    /// • A string which can be parsed as an object according to [RFC7159] will be converted into a
+    /// - A string which can be parsed as an object according to [RFC7159] will be converted into a
     /// map (with the values type-converted into map values as necessary according to the same
     /// rules) if so required.
     pub body: OrderedMap<String, Value>,
@@ -108,9 +108,9 @@ impl<'a> Request for CreateRequest<'a> {
 /// message MUST consist of an amqp-value section that contains a map containing the actual
 /// attributes of the entity created. These MAY differ from those requested in two ways:
 ///
-///     • Default values may be returned for values not specified
-///     • Specific/concrete values may be returned for generic/base values specified
-///     • The value associated with an attribute may have been converted into the correct amqp type
+/// - Default values may be returned for values not specified
+/// - Specific/concrete values may be returned for generic/base values specified
+/// - The value associated with an attribute may have been converted into the correct amqp type
 ///
 /// (e.g. the string “2” into the integer value 2) A map containing attributes that are not
 /// applicable for the entity being created, or invalid values for a given attribute, MUST result in

fe2o3-amqp-management/src/operations/node/mod.rs

@@ -1,15 +1,15 @@
 //! A Management Node Operation is an operation directed to the Management Node itself rather than an entity it is managing.
 //! Of the standard application-properties (see Section 3.1), name MUST be provided with a value of “self”, type MUST be provided with a value of “org.amqp.management” and identity MUST NOT be provided.
 //! The following Management Node Operations SHOULD be supported:
-//! • QUERY
-//! • GET-TYPES
-//! • GET-ANNOTATIONS
-//! • GET-ATTRIBUTES
-//! • GET-OPERATIONS
-//! • GET-MGMT-NODES
+//! - QUERY
+//! - GET-TYPES
+//! - GET-ANNOTATIONS
+//! - GET-ATTRIBUTES
+//! - GET-OPERATIONS
+//! - GET-MGMT-NODES
 //! The following Management Node Operations MAY be supported:
-//! • REGISTER
-//! • DEREGISTER
+//! - REGISTER
+//! - DEREGISTER
 
 mod deregister;
 mod get;

fe2o3-amqp-types/src/messaging/format/annotations.rs

@@ -41,7 +41,7 @@ use serde_amqp::{
 /// let mut annotations = Annotations::new();
 /// annotations.insert(OwnedKey::from(key), val.clone());
 ///
-/// let removed = annotations.remove(&key as &dyn AnnotationKey);
+/// let removed = annotations.swap_remove(&key as &dyn AnnotationKey);
 /// assert_eq!(removed, Some(val));
 /// ```
 pub type Annotations = OrderedMap<OwnedKey, Value>;

fe2o3-amqp-ws/Cargo.toml

@@ -48,5 +48,9 @@ web-sys = { version = "0.3", features = [
   "BinaryType",
 ] }
 
+[dev-dependencies]
+fe2o3-amqp = { workspace = true }
+
 [target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
-tokio = { workspace = true, features = ["net"] }
+tokio = { workspace = true, features = ["net", "rt-multi-thread"] }
+

fe2o3-amqp-ws/src/lib.rs

@@ -129,7 +129,7 @@ pin_project! {
     ///
     /// #[tokio::main]
     /// async fn main() {
-    ///     let (ws_stream, _response) = WebSocketStream::connect("ws://localhost:5673")
+    ///     let ws_stream = WebSocketStream::connect("ws://localhost:5673")
     ///         .await
     ///         .unwrap();
     ///     let mut connection = Connection::builder()

fe2o3-amqp/Cargo.toml

@@ -69,7 +69,7 @@ hmac = { version = "0.12", optional = true }
 pbkdf2 = { version = "0.12", default-features = false, optional = true }
 webpki-roots = { version = "0.26", optional = true }
 tokio-rustls = { version = "0.26", default-features = false, features = ["logging", "tls12", "ring"], optional = true }
-librustls = { package = "rustls", version = "0.23", default-features = false, optional = true }
+librustls = { package = "rustls", version = "0.23", default-features = false, features = ["logging", "std", "tls12", "ring"], optional = true }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 tokio = { workspace = true, features = ["sync", "io-util", "net", "rt", "macros", "time"] }

fe2o3-amqp/Makefile.toml

@@ -27,12 +27,12 @@ dependencies = [
   "check_feature_group5_wasm32",
   "check_feature_group6_wasm32",
 
-  # rustls has problem with wasm target
-  "check_feature_rustls_wasm32",
-  "check_feature_group1_wasm32",
-  "check_feature_group3_wasm32",
-  "check_feature_group7_wasm32",
-  "check_all_features_wasm32",
+  # # rustls has problem with wasm target
+  # "check_feature_rustls_wasm32",
+  # "check_feature_group1_wasm32",
+  # "check_feature_group3_wasm32",
+  # "check_feature_group7_wasm32",
+  # "check_all_features_wasm32",
 ]
 
 [tasks.check_all_features]

fe2o3-amqp/tests/broker_connection_compat.rs

@@ -15,30 +15,34 @@ cfg_not_wasm32! {
     mod common;
 
     #[tokio::test]
+    async fn test_connection_compat() {
+        activemq_artemis_connection().await;
+        activemq_artemis_sasl_plain_connection().await;
+        rabbitmq_amqp10_connection().await;
+        rabbitmq_amqp10_sasl_plain_connection().await;
+    }
+
     async fn activemq_artemis_connection() {
         let (_node, port) = common::setup_activemq_artemis(None, None).await;
         let url = format!("amqp://localhost:{}", port);
         let mut connection = Connection::open("test-connection", &url[..]).await.unwrap();
         connection.close().await.unwrap();
     }
 
-    #[tokio::test]
     async fn activemq_artemis_sasl_plain_connection() {
         let (_node, port) = common::setup_activemq_artemis(Some("guest"), Some("guest")).await;
         let url = format!("amqp://guest:guest@localhost:{}", port);
         let mut connection = Connection::open("test-connection", &url[..]).await.unwrap();
         connection.close().await.unwrap();
     }
 
-    #[tokio::test]
     async fn rabbitmq_amqp10_connection() {
         let (_node, port) = common::setup_rabbitmq_amqp10(None, None).await;
         let url = format!("amqp://localhost:{}", port);
         let mut connection = Connection::open("test-connection", &url[..]).await.unwrap();
         connection.close().await.unwrap();
     }
 
-    #[tokio::test]
     async fn rabbitmq_amqp10_sasl_plain_connection() {
         let (_node, port) = common::setup_rabbitmq_amqp10(Some("guest"), Some("guest")).await;
         let url = format!("amqp://guest:guest@localhost:{}", port);

fe2o3-amqp/tests/link.rs

@@ -1,5 +1,7 @@
 //! Tests sending and receiving small messages with active mq artemis
 
+// TODO: interop testing with other AMQP 1.0 brokers
+
 macro_rules! cfg_not_wasm32 {
     ($($item:item)*) => {
         $(
@@ -16,6 +18,13 @@ cfg_not_wasm32! {
     mod common;
 
     #[tokio::test]
+    async fn test_send_receive_compat() {
+        activemq_artemis_send_receive().await;
+        activemq_artemis_send_receive_large_content().await;
+        rabbitmq_amqp10_send_receive().await;
+        rabbitmq_amqp10_send_receive_large_content().await;
+    }
+
     async fn activemq_artemis_send_receive() {
         let (_node, port) = common::setup_activemq_artemis(None, None).await;
 
@@ -43,7 +52,6 @@ cfg_not_wasm32! {
         connection.close().await.unwrap();
     }
 
-    #[tokio::test]
     async fn activemq_artemis_send_receive_large_content() {
         let (_node, port) = common::setup_activemq_artemis(None, None).await;
 
@@ -71,7 +79,6 @@ cfg_not_wasm32! {
         connection.close().await.unwrap();
     }
 
-    #[tokio::test]
     async fn rabbitmq_amqp10_send_receive() {
         let (_node, port) = common::setup_rabbitmq_amqp10(None, None).await;
 
@@ -100,7 +107,6 @@ cfg_not_wasm32! {
         connection.close().await.unwrap();
     }
 
-    #[tokio::test]
     async fn rabbitmq_amqp10_send_receive_large_content() {
         let (_node, port) = common::setup_rabbitmq_amqp10(None, None).await;
 

serde_amqp/Cargo.toml

@@ -49,7 +49,7 @@ serde_amqp_derive = { workspace = true, optional = true }
 
 # Optinal dependencies
 serde_json = { version = "1", optional = true }
-chrono = { version = "0.4", optional = true }
+chrono = { version = "0.4.30", optional = true }
 uuid = { workspace = true, optional = true }
 time = { version = "0.3", optional = true }
 

serde_amqp/src/primitives/timestamp.rs

@@ -148,10 +148,10 @@ impl TryFrom<Timestamp> for chrono::DateTime<chrono::Utc> {
     /// removed in favour of the one provided with the "chrono-preview" feature in the next major
     /// version.
     fn try_from(value: Timestamp) -> Result<Self, Self::Error> {
-        let native_time =
-            chrono::NaiveDateTime::from_timestamp_millis(value.milliseconds()).ok_or(value)?;
-        Ok(chrono::DateTime::<chrono::Utc>::from_utc(
-            native_time,
+        let datetime =
+            chrono::DateTime::from_timestamp_millis(value.milliseconds()).ok_or(value)?;
+        Ok(chrono::DateTime::<chrono::Utc>::from_naive_utc_and_offset(
+            datetime.naive_utc(),
             chrono::Utc,
         ))
     }
@@ -171,9 +171,11 @@ impl From<Timestamp> for Option<chrono::DateTime<chrono::Utc>> {
     /// removed in favour of the one provided with the "chrono-preview" feature in the next major
     /// version.
     fn from(value: Timestamp) -> Self {
-        let native_time = chrono::NaiveDateTime::from_timestamp_millis(value.milliseconds())?;
-        Some(chrono::DateTime::<chrono::Utc>::from_utc(
-            native_time,
+        let datetime = chrono::DateTime::from_timestamp_millis(value.milliseconds())
+            .ok_or(value)
+            .ok()?;
+        Some(chrono::DateTime::<chrono::Utc>::from_naive_utc_and_offset(
+            datetime.naive_utc(),
             chrono::Utc,
         ))
     }

serde_amqp_derive/Cargo.toml

@@ -21,7 +21,7 @@ serde = { workspace = true, features = ["derive"] }
 
 [dependencies]
 convert_case = "0.6.0"
-darling = "0.14.1"
+darling = "0.20"
 proc-macro2 = "1"
 quote = "1"
-syn = { version = "1", features = ["parsing", "derive"] } 
+syn = { version = "2", features = ["parsing", "derive"] } 

serde_amqp_derive/src/lib.rs

@@ -1,3 +1,5 @@
+#![allow(clippy::manual_unwrap_or_default)] // clippy complains about code generated by darling
+
 //! Provides custom derive macros `SerializeComposite` and `DeserializeComposite` for described
 //! types as defined in the AMQP1.0 protocol.
 //!

serde_amqp_derive/src/util.rs

@@ -114,10 +114,9 @@ pub(crate) fn parse_named_field_attrs<'a>(
 ) -> Vec<FieldAttr> {
     fields
         .map(|f| {
-            f.attrs.iter().find_map(|a| {
-                let item = a.parse_meta().unwrap();
-                FieldAttr::from_meta(&item).ok()
-            })
+            f.attrs
+                .iter()
+                .find_map(|a| FieldAttr::from_meta(&a.meta).ok())
         })
         .map(|o| o.unwrap_or(FieldAttr { default: false }))
         .collect()
@@ -126,7 +125,7 @@ pub(crate) fn parse_named_field_attrs<'a>(
 pub(crate) fn get_span_of(ident_str: &str, ctx: &DeriveInput) -> Option<Span> {
     ctx.attrs
         .iter()
-        .find_map(|attr| match attr.path.get_ident() {
+        .find_map(|attr| match attr.path().get_ident() {
             Some(i) => {
                 if *i == ident_str {
                     Some(i.span())