Skip to content

function-after: use input to function as source in error message #1278

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

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

function-after: use input to function as source in error message #1278

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad8a8eb
function-after: use input to function as source in error message
davidhewitt Apr 23, 2024
dc9007a
Merge branch 'main' into dh/function-after-input
sydney-runkle Nov 21, 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
16 changes: 10 additions & 6 deletions src/validators/function.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,19 +160,19 @@ impl_build!(FunctionAfterValidator, "function-after");
impl FunctionAfterValidator {
fn _validate<'py, I: Input<'py> + ?Sized>(
&self,
call: impl FnOnce(&I, &mut ValidationState<'_, 'py>) -> ValResult<PyObject>,
call: impl FnOnce(&I, &mut ValidationState<'_, 'py>) -> ValResult<Bound<'py, PyAny>>,
py: Python<'py>,
input: &I,
state: &mut ValidationState<'_, 'py>,
) -> ValResult<PyObject> {
let v = call(input, state)?;
let r = if self.info_arg {
let info = ValidationInfo::new(py, state.extra(), &self.config, self.field_name.clone());
self.func.call1(py, (v.to_object(py), info))
self.func.call1(py, (v.clone(), info))
} else {
self.func.call1(py, (v.to_object(py),))
self.func.call1(py, (v.clone(),))
};
r.map_err(|e| convert_err(py, e, input))
r.map_err(|e| convert_err(py, e, v))
}
}

Expand All @@ -189,7 +189,9 @@ impl Validator for FunctionAfterValidator {
input: &(impl Input<'py> + ?Sized),
state: &mut ValidationState<'_, 'py>,
) -> ValResult<PyObject> {
let validate = |v: &_, s: &mut ValidationState<'_, 'py>| self.validator.validate(py, v, s);
let validate = |v: &_, s: &mut ValidationState<'_, 'py>| {
self.validator.validate(py, v, s).map(|object| object.into_bound(py))
};
self._validate(validate, py, input, state)
}
fn validate_assignment<'py>(
Expand All @@ -201,7 +203,9 @@ impl Validator for FunctionAfterValidator {
state: &mut ValidationState<'_, 'py>,
) -> ValResult<PyObject> {
let validate = move |v: &Bound<'py, PyAny>, s: &mut ValidationState<'_, 'py>| {
self.validator.validate_assignment(py, v, field_name, field_value, s)
self.validator
.validate_assignment(py, v, field_name, field_value, s)
.map(|object| object.into_bound(py))
};
self._validate(validate, py, obj, state)
}
Expand Down
Loading