serde_json based FlatMapDeserializer implementation.

Cargo.toml

@@ -8,7 +8,7 @@ description = "Core library for Verifiable Credentials and Decentralized Identif
 repository = "https://github.com/spruceid/ssi/"
 documentation = "https://docs.rs/ssi/"
 keywords = ["ssi", "did", "vc", "vp", "jsonld"]
-rust-version = "1.82"
+rust-version = "1.87"
 
 [workspace]
 members = [

crates/caips/src/caip10.rs

@@ -95,10 +95,10 @@ impl<V: Vocabulary, I: Interpretation> linked_data::LinkedDataResource<I, V>
     for BlockchainAccountId
 {
     fn interpretation(
-        &self,
+        &'_ self,
         _vocabulary: &mut V,
         _interpretation: &mut I,
-    ) -> linked_data::ResourceInterpretation<I, V> {
+    ) -> linked_data::ResourceInterpretation<'_, I, V> {
         use linked_data::{rdf_types::Term, CowRdfTerm, RdfLiteral, ResourceInterpretation};
         ResourceInterpretation::Uninterpreted(Some(CowRdfTerm::Owned(Term::Literal(
             RdfLiteral::Xsd(xsd_types::Value::String(self.to_string())),
@@ -406,10 +406,10 @@ impl<V: Vocabulary, I: Interpretation, T> linked_data::LinkedDataResource<I, V>
     for TypedBlockchainAccountId<T>
 {
     fn interpretation(
-        &self,
+        &'_ self,
         _vocabulary: &mut V,
         _interpretation: &mut I,
-    ) -> linked_data::ResourceInterpretation<I, V> {
+    ) -> linked_data::ResourceInterpretation<'_, I, V> {
         use linked_data::{rdf_types::Term, CowRdfTerm, RdfLiteral, ResourceInterpretation};
         ResourceInterpretation::Uninterpreted(Some(CowRdfTerm::Owned(Term::Literal(
             RdfLiteral::Xsd(xsd_types::Value::String(self.to_string())),

crates/claims/crates/cose/src/algorithm.rs

@@ -39,7 +39,7 @@ pub fn algorithm_name(algorithm: &Algorithm) -> String {
 }
 
 /// Returns the preferred signature algorithm for the give COSE key.
-pub fn preferred_algorithm(key: &CoseKey) -> Option<Cow<Algorithm>> {
+pub fn preferred_algorithm(key: &'_ CoseKey) -> Option<Cow<'_, Algorithm>> {
     key.alg
         .as_ref()
         .map(Cow::Borrowed)

crates/claims/crates/cose/src/key.rs

@@ -19,25 +19,25 @@ pub trait CoseKeyResolver {
     /// Fetches the COSE key associated to the give identifier.
     #[allow(async_fn_in_trait)]
     async fn fetch_public_cose_key(
-        &self,
+        &'_ self,
         id: Option<&[u8]>,
-    ) -> Result<Cow<CoseKey>, ProofValidationError>;
+    ) -> Result<Cow<'_, CoseKey>, ProofValidationError>;
 }
 
 impl<T: CoseKeyResolver> CoseKeyResolver for &T {
     async fn fetch_public_cose_key(
-        &self,
+        &'_ self,
         id: Option<&[u8]>,
-    ) -> Result<Cow<CoseKey>, ProofValidationError> {
+    ) -> Result<Cow<'_, CoseKey>, ProofValidationError> {
         T::fetch_public_cose_key(*self, id).await
     }
 }
 
 impl CoseKeyResolver for CoseKey {
     async fn fetch_public_cose_key(
-        &self,
+        &'_ self,
         _id: Option<&[u8]>,
-    ) -> Result<Cow<CoseKey>, ProofValidationError> {
+    ) -> Result<Cow<'_, CoseKey>, ProofValidationError> {
         Ok(Cow::Borrowed(self))
     }
 }

crates/claims/crates/cose/src/lib.rs

@@ -109,7 +109,7 @@ pub use sign1::*;
 ///       "application/json+cose".to_owned(),
 ///     ))
 ///   }
-///   
+///
 ///   fn content_type(&self) -> Option<ContentType> {
 ///     Some(ContentType::Text("application/json".to_owned()))
 ///   }
@@ -136,7 +136,7 @@ pub trait CosePayload {
     /// Payload bytes.
     ///
     /// Returns the payload bytes representing this value.
-    fn payload_bytes(&self) -> Cow<[u8]>;
+    fn payload_bytes(&'_ self) -> Cow<'_, [u8]>;
 
     /// Sign the payload to produce a serialized `COSE_Sign1` object.
     ///
@@ -153,7 +153,7 @@ pub trait CosePayload {
 }
 
 impl CosePayload for [u8] {
-    fn payload_bytes(&self) -> Cow<[u8]> {
+    fn payload_bytes(&'_ self) -> Cow<'_, [u8]> {
         Cow::Borrowed(self)
     }
 }

crates/claims/crates/data-integrity/core/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ssi-data-integrity-core"
-version = "0.3.0"
+version = "0.3.1"
 edition = "2021"
 authors = ["Spruce Systems, Inc."]
 license = "Apache-2.0"

crates/claims/crates/data-integrity/core/src/document.rs

@@ -62,13 +62,13 @@ impl ssi_json_ld::Expandable for DataIntegrityDocument {
 }
 
 impl JsonLdObject for DataIntegrityDocument {
-    fn json_ld_context(&self) -> Option<Cow<ssi_json_ld::syntax::Context>> {
+    fn json_ld_context(&'_ self) -> Option<Cow<'_, ssi_json_ld::syntax::Context>> {
         self.context.as_ref().map(Cow::Borrowed)
     }
 }
 
 impl JsonLdNodeObject for DataIntegrityDocument {
-    fn json_ld_type(&self) -> ssi_json_ld::JsonLdTypes {
+    fn json_ld_type(&'_ self) -> ssi_json_ld::JsonLdTypes<'_> {
         ssi_json_ld::JsonLdTypes::new(&[], Cow::Borrowed(self.types.as_slice()))
     }
 }

crates/claims/crates/data-integrity/core/src/proof/configuration/expansion.rs

@@ -81,13 +81,13 @@ pub struct EmbeddedProofConfigurationRef<'d, 'a, S: CryptographicSuite> {
 }
 
 impl<S: CryptographicSuite> JsonLdObject for EmbeddedProofConfigurationRef<'_, '_, S> {
-    fn json_ld_context(&self) -> Option<Cow<ssi_json_ld::syntax::Context>> {
+    fn json_ld_context(&'_ self) -> Option<Cow<'_, ssi_json_ld::syntax::Context>> {
         self.context.as_deref().map(Cow::Borrowed)
     }
 }
 
 impl<S: CryptographicSuite> JsonLdNodeObject for EmbeddedProofConfigurationRef<'_, '_, S> {
-    fn json_ld_type(&self) -> JsonLdTypes {
+    fn json_ld_type(&'_ self) -> JsonLdTypes<'_> {
         self.type_.reborrow()
     }
 }

crates/claims/crates/data-integrity/core/src/proof/configuration/mod.rs

@@ -218,7 +218,7 @@ impl<S: CryptographicSuite> ProofConfiguration<S> {
         }
     }
 
-    pub fn borrowed(&self) -> ProofConfigurationRef<S> {
+    pub fn borrowed(&'_ self) -> ProofConfigurationRef<'_, S> {
         ProofConfigurationRef {
             context: self.context.as_ref(),
             type_: &self.type_,

crates/claims/crates/data-integrity/core/src/proof/de/configuration.rs

@@ -9,7 +9,7 @@ use serde::{
 use ssi_core::de::WithType;
 use std::{collections::BTreeMap, marker::PhantomData};
 
-use super::{Field, RefOrValue, ReplayMap, TypeField};
+use super::{Field, FlatMapDeserializer, RefOrValue, ReplayMap, TypeField};
 
 impl<'de, T: DeserializeCryptographicSuite<'de>> ProofConfiguration<T> {
     fn deserialize_with_type<S>(type_: Type, mut deserializer: S) -> Result<Self, S::Error>
@@ -53,10 +53,7 @@ impl<'de, T: DeserializeCryptographicSuite<'de>> ProofConfiguration<T> {
         }
 
         let options = WithType::<T, OptionsOf<T>>::new(&suite)
-            .deserialize(serde::__private::de::FlatMapDeserializer(
-                &mut other,
-                PhantomData,
-            ))?
+            .deserialize(FlatMapDeserializer::new(&mut other))?
             .0;
 
         Ok(Self {
@@ -73,10 +70,7 @@ impl<'de, T: DeserializeCryptographicSuite<'de>> ProofConfiguration<T> {
             challenge,
             nonce,
             options,
-            extra_properties: BTreeMap::deserialize(serde::__private::de::FlatMapDeserializer(
-                &mut other,
-                PhantomData,
-            ))?,
+            extra_properties: BTreeMap::deserialize(FlatMapDeserializer::new(&mut other))?,
         })
     }
 }