mirrors/thiserror
1
0
Fork 0
mirror of https://github.com/dtolnay/thiserror.git synced 2025-04-06 06:17:39 +03:00
Code Issues Projects Releases Packages Wiki Activity

Use IdentUnraw consistently when comparing Member

Browse source
This commit is contained in:
David Tolnay 2024-11-04 16:15:35 -05:00
parent 3d23842d35
commit 9116fdb8ea
No known key found for this signature in database
GPG key ID: F9BA143B95FF6D82
8 changed files with 84 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

16
impl/src/expand.rs
View file

@ -1,11 +1,11 @@
use crate::ast::{Enum, Field, Input, Struct};
use crate::attr::Trait;
use crate::generics::InferredBounds;
use crate::span::MemberSpan;
use crate::unraw::MemberUnraw;
use proc_macro2::TokenStream;
use quote::{format_ident, quote, quote_spanned, ToTokens};
use std::collections::BTreeSet as Set;
use syn::{DeriveInput, GenericArgument, Member, PathArguments, Result, Token, Type};
use syn::{DeriveInput, GenericArgument, PathArguments, Result, Token, Type};
pub fn derive(input: &DeriveInput) -> TokenStream {
match try_expand(input) {
@ -409,8 +409,8 @@ fn impl_enum(input: Enum) -> TokenStream {
}
None => {
let only_field = match &variant.fields[0].member {
Member::Named(ident) => ident.clone(),
Member::Unnamed(index) => format_ident!("_{}", index),
MemberUnraw::Named(ident) => ident.to_local(),
MemberUnraw::Unnamed(index) => format_ident!("_{}", index),
};
display_implied_bounds.insert((0, Trait::Display));
quote!(::core::fmt::Display::fmt(#only_field, __formatter))
@ -487,11 +487,11 @@ fn impl_enum(input: Enum) -> TokenStream {
fn fields_pat(fields: &[Field]) -> TokenStream {
let mut members = fields.iter().map(|field| &field.member).peekable();
match members.peek() {
Some(Member::Named(_)) => quote!({ #(#members),* }),
Some(Member::Unnamed(_)) => {
Some(MemberUnraw::Named(_)) => quote!({ #(#members),* }),
Some(MemberUnraw::Unnamed(_)) => {
let vars = members.map(|member| match member {
Member::Unnamed(member) => format_ident!("_{}", member),
Member::Named(_) => unreachable!(),
MemberUnraw::Unnamed(member) => format_ident!("_{}", member),
MemberUnraw::Named(_) => unreachable!(),
});
quote!((#(#vars),*))
}