luxolus
/
pyo3
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1489 from davidhewitt/fix-msrv-matches 

msrv: remove use of matches! macro
This commit is contained in:
messense 2021-03-12 16:55:41 +08:00 committed by GitHub
parent b75a8f6e8b e55fe205ed
commit 5014b60e5e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pyo3-macros-backend/src/method.rs
View File

@ -28,10 +28,9 @@ impl<'a> FnArg<'a> {
bail_spanned!(recv.span() => "unexpected receiver")
} // checked in parse_fn_type
syn::FnArg::Typed(cap) => {
ensure_spanned!(
!matches!(&*cap.ty, syn::Type::ImplTrait(_)),
cap.ty.span() => IMPL_TRAIT_ERR
);
if let syn::Type::ImplTrait(_) = &*cap.ty {
bail_spanned!(cap.ty.span() => IMPL_TRAIT_ERR);
}
let arg_attrs = PyFunctionArgAttrs::from_attrs(&mut cap.attrs)?;
let (ident, by_ref, mutability) = match *cap.pat {
@ -149,10 +148,9 @@ pub fn parse_method_receiver(arg: &syn::FnArg) -> syn::Result<SelfType> {
mutable: recv.mutability.is_some(),
}),
syn::FnArg::Typed(syn::PatType { ty, .. }) => {
ensure_spanned!(
!matches!(&**ty, syn::Type::ImplTrait(_)),
ty.span() => IMPL_TRAIT_ERR
);
if let syn::Type::ImplTrait(_) = &**ty {
bail_spanned!(ty.span() => IMPL_TRAIT_ERR);
}
Ok(SelfType::TryFromPyCell(ty.span()))
}
}