Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

der_derive: add workaround for syn v2.0.73 #1472

Closed
wants to merge 1 commit into from
Closed

der_derive: add workaround for syn v2.0.73 #1472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 8 additions & 11 deletions der_derive/src/choice.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
19 changes: 8 additions & 11 deletions der_derive/src/sequence.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
Loading