Skip to content

remove 's lifetime from validate and validate_assignment #890

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
merged 1 commit into from
Aug 16, 2023
Merged

remove 's lifetime from validate and validate_assignment #890

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
4 changes: 2 additions & 2 deletions src/validators/any.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ impl BuildValidator for AnyValidator {
impl_py_gc_traverse!(AnyValidator {});

impl Validator for AnyValidator {
fn validate<'s, 'data>(
&'s self,
fn validate<'data>(
&self,
py: Python<'data>,
input: &'data impl Input<'data>,
_state: &mut ValidationState,
Expand Down
4 changes: 2 additions & 2 deletions src/validators/arguments.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,8 +161,8 @@ impl_py_gc_traverse!(ArgumentsValidator {
});

impl Validator for ArgumentsValidator {
fn validate<'s, 'data>(
&'s self,
fn validate<'data>(
&self,
py: Python<'data>,
input: &'data impl Input<'data>,
state: &mut ValidationState,
Expand Down
4 changes: 2 additions & 2 deletions src/validators/bool.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ impl BuildValidator for BoolValidator {
impl_py_gc_traverse!(BoolValidator {});

impl Validator for BoolValidator {
fn validate<'s, 'data>(
&'s self,
fn validate<'data>(
&self,
py: Python<'data>,
input: &'data impl Input<'data>,
state: &mut ValidationState,
Expand Down
8 changes: 4 additions & 4 deletions src/validators/bytes.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ impl BuildValidator for BytesValidator {
impl_py_gc_traverse!(BytesValidator {});

impl Validator for BytesValidator {
fn validate<'s, 'data>(
&'s self,
fn validate<'data>(
&self,
py: Python<'data>,
input: &'data impl Input<'data>,
state: &mut ValidationState,
Expand Down Expand Up @@ -77,8 +77,8 @@ pub struct BytesConstrainedValidator {
impl_py_gc_traverse!(BytesConstrainedValidator {});

impl Validator for BytesConstrainedValidator {
fn validate<'s, 'data>(
&'s self,
fn validate<'data>(
&self,
py: Python<'data>,
input: &'data impl Input<'data>,
state: &mut ValidationState,
Expand Down
4 changes: 2 additions & 2 deletions src/validators/call.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ impl_py_gc_traverse!(CallValidator {
});

impl Validator for CallValidator {
fn validate<'s, 'data>(
&'s self,
fn validate<'data>(
&self,
py: Python<'data>,
input: &'data impl Input<'data>,
state: &mut ValidationState,
Expand Down
4 changes: 2 additions & 2 deletions src/validators/callable.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ impl BuildValidator for CallableValidator {
impl_py_gc_traverse!(CallableValidator {});

impl Validator for CallableValidator {
fn validate<'s, 'data>(
&'s self,
fn validate<'data>(
&self,
py: Python<'data>,
input: &'data impl Input<'data>,
_state: &mut ValidationState,
Expand Down
4 changes: 2 additions & 2 deletions src/validators/chain.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ fn build_validator_steps<'a>(
impl_py_gc_traverse!(ChainValidator { steps });

impl Validator for ChainValidator {
fn validate<'s, 'data>(
&'s self,
fn validate<'data>(
&self,
py: Python<'data>,
input: &'data impl Input<'data>,
state: &mut ValidationState,
Expand Down
4 changes: 2 additions & 2 deletions src/validators/custom_error.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ impl BuildValidator for CustomErrorValidator {
impl_py_gc_traverse!(CustomErrorValidator { validator });

impl Validator for CustomErrorValidator {
fn validate<'s, 'data>(
&'s self,
fn validate<'data>(
&self,
py: Python<'data>,
input: &'data impl Input<'data>,
state: &mut ValidationState,
Expand Down
16 changes: 8 additions & 8 deletions src/validators/dataclass.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,8 @@ impl_py_gc_traverse!(Field { validator });
impl_py_gc_traverse!(DataclassArgsValidator { fields });

impl Validator for DataclassArgsValidator {
fn validate<'s, 'data>(
&'s self,
fn validate<'data>(
&self,
py: Python<'data>,
input: &'data impl Input<'data>,
state: &mut ValidationState,
Expand Down Expand Up @@ -305,8 +305,8 @@ impl Validator for DataclassArgsValidator {
}
}

fn validate_assignment<'s, 'data: 's>(
&'s self,
fn validate_assignment<'data>(
&self,
py: Python<'data>,
obj: &'data PyAny,
field_name: &'data str,
Expand Down Expand Up @@ -466,8 +466,8 @@ impl BuildValidator for DataclassValidator {
impl_py_gc_traverse!(DataclassValidator { class, validator });

impl Validator for DataclassValidator {
fn validate<'s, 'data>(
&'s self,
fn validate<'data>(
&self,
py: Python<'data>,
input: &'data impl Input<'data>,
state: &mut ValidationState,
Expand Down Expand Up @@ -505,8 +505,8 @@ impl Validator for DataclassValidator {
}
}

fn validate_assignment<'s, 'data: 's>(
&'s self,
fn validate_assignment<'data>(
&self,
py: Python<'data>,
obj: &'data PyAny,
field_name: &'data str,
Expand Down
4 changes: 2 additions & 2 deletions src/validators/date.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ impl BuildValidator for DateValidator {
impl_py_gc_traverse!(DateValidator {});

impl Validator for DateValidator {
fn validate<'s, 'data>(
&'s self,
fn validate<'data>(
&self,
py: Python<'data>,
input: &'data impl Input<'data>,
state: &mut ValidationState,
Expand Down
4 changes: 2 additions & 2 deletions src/validators/datetime.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ impl BuildValidator for DateTimeValidator {
impl_py_gc_traverse!(DateTimeValidator {});

impl Validator for DateTimeValidator {
fn validate<'s, 'data>(
&'s self,
fn validate<'data>(
&self,
py: Python<'data>,
input: &'data impl Input<'data>,
state: &mut ValidationState,
Expand Down
4 changes: 2 additions & 2 deletions src/validators/decimal.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ impl_py_gc_traverse!(DecimalValidator {
});

impl Validator for DecimalValidator {
fn validate<'s, 'data>(
&'s self,
fn validate<'data>(
&self,
py: Python<'data>,
input: &'data impl Input<'data>,
state: &mut ValidationState,
Expand Down
10 changes: 5 additions & 5 deletions src/validators/definitions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ impl BuildValidator for DefinitionRefValidator {
impl_py_gc_traverse!(DefinitionRefValidator {});

impl Validator for DefinitionRefValidator {
fn validate<'s, 'data>(
&'s self,
fn validate<'data>(
&self,
py: Python<'data>,
input: &'data impl Input<'data>,
state: &mut ValidationState,
Expand All @@ -97,8 +97,8 @@ impl Validator for DefinitionRefValidator {
}
}

fn validate_assignment<'s, 'data: 's>(
&'s self,
fn validate_assignment<'data>(
&self,
py: Python<'data>,
obj: &'data PyAny,
field_name: &'data str,
Expand Down Expand Up @@ -149,7 +149,7 @@ impl Validator for DefinitionRefValidator {
}
}

fn validate<'s, 'data>(
fn validate<'data>(
validator_id: usize,
py: Python<'data>,
input: &'data impl Input<'data>,
Expand Down
4 changes: 2 additions & 2 deletions src/validators/dict.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ impl_py_gc_traverse!(DictValidator {
});

impl Validator for DictValidator {
fn validate<'s, 'data>(
&'s self,
fn validate<'data>(
&self,
py: Python<'data>,
input: &'data impl Input<'data>,
state: &mut ValidationState,
Expand Down
8 changes: 4 additions & 4 deletions src/validators/float.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ impl BuildValidator for FloatValidator {
impl_py_gc_traverse!(FloatValidator {});

impl Validator for FloatValidator {
fn validate<'s, 'data>(
&'s self,
fn validate<'data>(
&self,
py: Python<'data>,
input: &'data impl Input<'data>,
state: &mut ValidationState,
Expand Down Expand Up @@ -107,8 +107,8 @@ pub struct ConstrainedFloatValidator {
impl_py_gc_traverse!(ConstrainedFloatValidator {});

impl Validator for ConstrainedFloatValidator {
fn validate<'s, 'data>(
&'s self,
fn validate<'data>(
&self,
py: Python<'data>,
input: &'data impl Input<'data>,
state: &mut ValidationState,
Expand Down
4 changes: 2 additions & 2 deletions src/validators/frozenset.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ impl BuildValidator for FrozenSetValidator {
impl_py_gc_traverse!(FrozenSetValidator { item_validator });

impl Validator for FrozenSetValidator {
fn validate<'s, 'data>(
&'s self,
fn validate<'data>(
&self,
py: Python<'data>,
input: &'data impl Input<'data>,
state: &mut ValidationState,
Expand Down
20 changes: 10 additions & 10 deletions src/validators/function.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,17 +93,17 @@ macro_rules! impl_validator {
});

impl Validator for $name {
fn validate<'s, 'data>(
&'s self,
fn validate<'data>(
&self,
py: Python<'data>,
input: &'data impl Input<'data>,
state: &mut ValidationState<'_>,
) -> ValResult<'data, PyObject> {
let validate = |v, s: &mut ValidationState<'_>| self.validator.validate(py, v, s);
self._validate(validate, py, input.to_object(py).into_ref(py), state)
}
fn validate_assignment<'s, 'data: 's>(
&'s self,
fn validate_assignment<'data>(
&self,
py: Python<'data>,
obj: &'data PyAny,
field_name: &'data str,
Expand Down Expand Up @@ -246,8 +246,8 @@ impl BuildValidator for FunctionPlainValidator {
impl_py_gc_traverse!(FunctionPlainValidator { func, config });

impl Validator for FunctionPlainValidator {
fn validate<'s, 'data>(
&'s self,
fn validate<'data>(
&self,
py: Python<'data>,
input: &'data impl Input<'data>,
state: &mut ValidationState,
Expand Down Expand Up @@ -343,8 +343,8 @@ impl_py_gc_traverse!(FunctionWrapValidator {
});

impl Validator for FunctionWrapValidator {
fn validate<'s, 'data>(
&'s self,
fn validate<'data>(
&self,
py: Python<'data>,
input: &'data impl Input<'data>,
state: &mut ValidationState,
Expand All @@ -366,8 +366,8 @@ impl Validator for FunctionWrapValidator {
)
}

fn validate_assignment<'s, 'data: 's>(
&'s self,
fn validate_assignment<'data>(
&self,
py: Python<'data>,
obj: &'data PyAny,
field_name: &'data str,
Expand Down
17 changes: 7 additions & 10 deletions src/validators/generator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ impl BuildValidator for GeneratorValidator {
impl_py_gc_traverse!(GeneratorValidator { item_validator });

impl Validator for GeneratorValidator {
fn validate<'s, 'data>(
&'s self,
fn validate<'data>(
&self,
py: Python<'data>,
input: &'data impl Input<'data>,
state: &mut ValidationState,
Expand Down Expand Up @@ -249,8 +249,8 @@ impl InternalValidator {
}
}

pub fn validate_assignment<'s, 'data: 's>(
&'s mut self,
pub fn validate_assignment<'data>(
&mut self,
py: Python<'data>,
model: &'data PyAny,
field_name: &'data str,
Expand Down Expand Up @@ -281,15 +281,12 @@ impl InternalValidator {
})
}

pub fn validate<'s, 'data>(
&'s mut self,
pub fn validate<'data>(
&mut self,
py: Python<'data>,
input: &'data impl Input<'data>,
outer_location: Option<LocItem>,
) -> PyResult<PyObject>
where
's: 'data,
{
) -> PyResult<PyObject> {
let extra = Extra {
mode: self.validation_mode,
data: self.data.as_ref().map(|data| data.as_ref(py)),
Expand Down
8 changes: 4 additions & 4 deletions src/validators/int.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ impl BuildValidator for IntValidator {
impl_py_gc_traverse!(IntValidator {});

impl Validator for IntValidator {
fn validate<'s, 'data>(
&'s self,
fn validate<'data>(
&self,
py: Python<'data>,
input: &'data impl Input<'data>,
state: &mut ValidationState,
Expand Down Expand Up @@ -84,8 +84,8 @@ pub struct ConstrainedIntValidator {
impl_py_gc_traverse!(ConstrainedIntValidator {});

impl Validator for ConstrainedIntValidator {
fn validate<'s, 'data>(
&'s self,
fn validate<'data>(
&self,
py: Python<'data>,
input: &'data impl Input<'data>,
state: &mut ValidationState,
Expand Down
4 changes: 2 additions & 2 deletions src/validators/is_instance.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ impl BuildValidator for IsInstanceValidator {
impl_py_gc_traverse!(IsInstanceValidator { class });

impl Validator for IsInstanceValidator {
fn validate<'s, 'data>(
&'s self,
fn validate<'data>(
&self,
py: Python<'data>,
input: &'data impl Input<'data>,
_state: &mut ValidationState,
Expand Down
4 changes: 2 additions & 2 deletions src/validators/is_subclass.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ impl BuildValidator for IsSubclassValidator {
impl_py_gc_traverse!(IsSubclassValidator { class });

impl Validator for IsSubclassValidator {
fn validate<'s, 'data>(
&'s self,
fn validate<'data>(
&self,
py: Python<'data>,
input: &'data impl Input<'data>,
_state: &mut ValidationState,
Expand Down
Loading