der_derive: add workaround for syn v2.0.73

This workaround gets things compiling on `syn` v2.0.73. See #1471, dtolnay/syn#1718
RustCrypto · Aug 11, 2024 · 61e30ae · 61e30ae
1 parent 6456b48
commit 61e30ae
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 26 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/der_derive/src/choice.rs b/der_derive/src/choice.rs
@@ -54,17 +54,14 @@ impl DeriveChoice {
 
         // Use the first lifetime parameter as lifetime for Decode/Encode lifetime
         // if none found, add one.
-        let lifetime = generics
-            .lifetimes()
-            .next()
-            .map(|lt| lt.lifetime.clone())
-            .unwrap_or_else(|| {
-                let lt = default_lifetime();
-                generics
-                    .params
-                    .insert(0, GenericParam::Lifetime(LifetimeParam::new(lt.clone())));
-                lt
-            });
+        let maybe_lifetime = generics.lifetimes().next().map(|lt| lt.lifetime.clone());
+        let lifetime = maybe_lifetime.unwrap_or_else(|| {
+            let lt = default_lifetime();
+            generics
+                .params
+                .insert(0, GenericParam::Lifetime(LifetimeParam::new(lt.clone())));
+            lt
+        });
 
         // We may or may not have inserted a lifetime.
         let (_, ty_generics, where_clause) = self.generics.split_for_impl();

diff --git a/der_derive/src/sequence.rs b/der_derive/src/sequence.rs
@@ -54,17 +54,14 @@ impl DeriveSequence {
 
         // Use the first lifetime parameter as lifetime for Decode/Encode lifetime
         // if none found, add one.
-        let lifetime = generics
-            .lifetimes()
-            .next()
-            .map(|lt| lt.lifetime.clone())
-            .unwrap_or_else(|| {
-                let lt = default_lifetime();
-                generics
-                    .params
-                    .insert(0, GenericParam::Lifetime(LifetimeParam::new(lt.clone())));
-                lt
-            });
+        let maybe_lifetime = generics.lifetimes().next().map(|lt| lt.lifetime.clone());
+        let lifetime = maybe_lifetime.unwrap_or_else(|| {
+            let lt = default_lifetime();
+            generics
+                .params
+                .insert(0, GenericParam::Lifetime(LifetimeParam::new(lt.clone())));
+            lt
+        });
 
         // We may or may not have inserted a lifetime.
         let (_, ty_generics, where_clause) = self.generics.split_for_impl();