Skip to content

Refactoring of FnArg #4033

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

Merged
Icxolu merged 7 commits into from
Apr 14, 2024
Merged

Refactoring of FnArg #4033

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
deec739
refactor `FnArg`
Icxolu Mar 31, 2024
3087e6d
add UI tests
Icxolu Apr 1, 2024
b97d2c4
use enum variant types
Icxolu Apr 2, 2024
f578da1
add comment
Icxolu Apr 2, 2024
7c924e9
remove dead code
Icxolu Apr 2, 2024
e764067
remove last FIXME
Icxolu Apr 3, 2024
68bff0f
review feedback davidhewitt
Icxolu Apr 14, 2024
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
Prev Previous commit
Next Next commit
remove dead code
  • Loading branch information
@Icxolu
Icxolu committed Apr 2, 2024
commit 7c924e9b8bce5036348e73eadce0848f0499e645
22 changes: 2 additions & 20 deletions pyo3-macros-backend/src/method.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,12 @@ pub struct RegularArg<'a> {
pub struct VarArg<'a> {
pub name: &'a syn::Ident,
pub ty: &'a syn::Type,
pub attrs: PyFunctionArgPyO3Attributes,
}

#[derive(Clone, Debug)]
pub struct KwArg<'a> {
pub name: &'a syn::Ident,
pub ty: &'a syn::Type,
pub attrs: PyFunctionArgPyO3Attributes,
}

#[derive(Clone, Debug)]
Expand Down Expand Up @@ -94,19 +92,11 @@ impl<'a> FnArg<'a> {
if let Self::Regular(RegularArg {
name,
ty,
attrs,
option_wrapped_type: None,
..
}) = self
{
let attrs = std::mem::replace(
attrs,
PyFunctionArgPyO3Attributes {
from_py_with: None,
cancel_handle: None,
},
);
*self = Self::VarArgs(VarArg { name, ty, attrs });
*self = Self::VarArgs(VarArg { name, ty });
Ok(self)
} else {
bail_spanned!(self.name().span() => "args cannot be optional")
Expand All @@ -117,19 +107,11 @@ impl<'a> FnArg<'a> {
if let Self::Regular(RegularArg {
name,
ty,
attrs,
option_wrapped_type: Some(..),
..
}) = self
{
let attrs = std::mem::replace(
attrs,
PyFunctionArgPyO3Attributes {
from_py_with: None,
cancel_handle: None,
},
);
*self = Self::KwArgs(KwArg { name, ty, attrs });
*self = Self::KwArgs(KwArg { name, ty });
Ok(self)
} else {
bail_spanned!(self.name().span() => "kwargs must be Option<_>")
Expand Down