Repository navigation
Conversation
Compute an unwrapped reference for the validated field (accounting for Option<T>, Option<Option<T>>, and by-value number bindings) and match against the Option nesting depth of `other` in `must_match_tokens` (0, 1, or 2 Option layers, including fields marked `#[validate(skip)]`). Fixes Keats#330
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fix
#[validate(must_match(other = "..."))]when either the validated field orother(or both) is wrapped inOption(with or without#[validate(required)]):validator_derive/src/lib.rs: Pass a&Treference (field_ref) for the unwrapped field value intomust_match_tokens(avoiding&&Twhenif_let_option_wrapperbindsSome(ref field)) and look up theOptionnesting count ofotheracross all struct fields (including#[validate(skip)]fields).validator_derive/src/tokens/must_match.rs: Comparefield_refagainst&self.<other>whenotheris non-optional,self.<other>.as_ref()whenotherisOption<T>, andself.<other>.as_ref().and_then(Option::as_ref)whenotherisOption<Option<T>>, while preservingvalueandothererror parameters.validator_derive_tests: Add unit andrun-passtests coveringOption<T>,Option<Option<T>>, mixed optional/non-optional fields,requiredcombinations,#[validate(skip)], and numericOptiontypes.Fixes #330