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

Remove same_member in favor of MemberUnraw's PartialEq impl

Browse source
This commit is contained in:
David Tolnay 2024-11-04 23:31:14 -05:00
parent 3382a2a09c
commit 9d7602e226
No known key found for this signature in database
GPG key ID: F9BA143B95FF6D82
1 changed files with 2 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

13
impl/src/valid.rs
View file

@ -1,6 +1,5 @@
use crate::ast::{Enum, Field, Input, Struct, Variant}; use crate::ast::{Enum, Field, Input, Struct, Variant};
use crate::attr::Attrs; use crate::attr::Attrs;
use crate::unraw::MemberUnraw;
use quote::ToTokens; use quote::ToTokens;
use std::collections::BTreeSet as Set; use std::collections::BTreeSet as Set;
use syn::{Error, GenericArgument, PathArguments, Result, Type}; use syn::{Error, GenericArgument, PathArguments, Result, Type};
@ -173,7 +172,7 @@ fn check_field_attrs(fields: &[Field]) -> Result<()> {
has_backtrace |= field.is_backtrace(); has_backtrace |= field.is_backtrace();
} }
if let (Some(from_field), Some(source_field)) = (from_field, source_field) { if let (Some(from_field), Some(source_field)) = (from_field, source_field) {
if !same_member(from_field, source_field) { if from_field.member != source_field.member {
return Err(Error::new_spanned( return Err(Error::new_spanned(
from_field.attrs.from, from_field.attrs.from,
"#[from] is only supported on the source field, not any other field", "#[from] is only supported on the source field, not any other field",
@ -182,7 +181,7 @@ fn check_field_attrs(fields: &[Field]) -> Result<()> {
} }
if let Some(from_field) = from_field { if let Some(from_field) = from_field {
let max_expected_fields = match backtrace_field { let max_expected_fields = match backtrace_field {
Some(backtrace_field) => 1 + !same_member(from_field, backtrace_field) as usize, Some(backtrace_field) => 1 + (from_field.member != backtrace_field.member) as usize,
None => 1 + has_backtrace as usize, None => 1 + has_backtrace as usize,
}; };
if fields.len() > max_expected_fields { if fields.len() > max_expected_fields {
@ -203,14 +202,6 @@ fn check_field_attrs(fields: &[Field]) -> Result<()> {
Ok(()) Ok(())
} }
fn same_member(one: &Field, two: &Field) -> bool {
match (&one.member, &two.member) {
(MemberUnraw::Named(one), MemberUnraw::Named(two)) => one == two,
(MemberUnraw::Unnamed(one), MemberUnraw::Unnamed(two)) => one.index == two.index,
_ => unreachable!(),
}
}
fn contains_non_static_lifetime(ty: &Type) -> bool { fn contains_non_static_lifetime(ty: &Type) -> bool {
match ty { match ty {
Type::Path(ty) => { Type::Path(ty) => {