Skip to content

Commit

Permalink
remove now unused different_strict_behavior
Browse files Browse the repository at this point in the history
  • Loading branch information
davidhewitt committed Aug 14, 2023
1 parent ee04393 commit b6df368
Show file tree
Hide file tree
Showing 41 changed files with 0 additions and 507 deletions.
8 changes: 0 additions & 8 deletions src/validators/any.rs
Expand Up @@ -39,14 +39,6 @@ impl Validator for AnyValidator {
Ok(input.to_object(py))
}

fn different_strict_behavior(
&self,
_definitions: Option<&DefinitionsBuilder<CombinedValidator>>,
_ultra_strict: bool,
) -> bool {
false
}

fn get_name(&self) -> &str {
Self::EXPECTED_TYPE
}
Expand Down
10 changes: 0 additions & 10 deletions src/validators/arguments.rs
Expand Up @@ -336,16 +336,6 @@ impl Validator for ArgumentsValidator {
}
}

fn different_strict_behavior(
&self,
definitions: Option<&DefinitionsBuilder<CombinedValidator>>,
ultra_strict: bool,
) -> bool {
self.parameters
.iter()
.any(|p| p.validator.different_strict_behavior(definitions, ultra_strict))
}

fn get_name(&self) -> &str {
Self::EXPECTED_TYPE
}
Expand Down
8 changes: 0 additions & 8 deletions src/validators/bool.rs
Expand Up @@ -44,14 +44,6 @@ impl Validator for BoolValidator {
.map(|val_match| val_match.unpack(state).into_py(py))
}

fn different_strict_behavior(
&self,
_definitions: Option<&DefinitionsBuilder<CombinedValidator>>,
ultra_strict: bool,
) -> bool {
!ultra_strict
}

fn get_name(&self) -> &str {
Self::EXPECTED_TYPE
}
Expand Down
16 changes: 0 additions & 16 deletions src/validators/bytes.rs
Expand Up @@ -52,14 +52,6 @@ impl Validator for BytesValidator {
Ok(either_bytes.into_py(py))
}

fn different_strict_behavior(
&self,
_definitions: Option<&DefinitionsBuilder<CombinedValidator>>,
ultra_strict: bool,
) -> bool {
!ultra_strict
}

fn get_name(&self) -> &str {
Self::EXPECTED_TYPE
}
Expand Down Expand Up @@ -116,14 +108,6 @@ impl Validator for BytesConstrainedValidator {
Ok(either_bytes.into_py(py))
}

fn different_strict_behavior(
&self,
_definitions: Option<&DefinitionsBuilder<CombinedValidator>>,
ultra_strict: bool,
) -> bool {
!ultra_strict
}

fn get_name(&self) -> &str {
"constrained-bytes"
}
Expand Down
14 changes: 0 additions & 14 deletions src/validators/call.rs
Expand Up @@ -99,20 +99,6 @@ impl Validator for CallValidator {
}
}

fn different_strict_behavior(
&self,
definitions: Option<&DefinitionsBuilder<CombinedValidator>>,
ultra_strict: bool,
) -> bool {
if let Some(return_validator) = &self.return_validator {
if return_validator.different_strict_behavior(definitions, ultra_strict) {
return true;
}
}
self.arguments_validator
.different_strict_behavior(definitions, ultra_strict)
}

fn get_name(&self) -> &str {
&self.name
}
Expand Down
8 changes: 0 additions & 8 deletions src/validators/callable.rs
Expand Up @@ -39,14 +39,6 @@ impl Validator for CallableValidator {
}
}

fn different_strict_behavior(
&self,
_definitions: Option<&DefinitionsBuilder<CombinedValidator>>,
_ultra_strict: bool,
) -> bool {
false
}

fn get_name(&self) -> &str {
Self::EXPECTED_TYPE
}
Expand Down
10 changes: 0 additions & 10 deletions src/validators/chain.rs
Expand Up @@ -84,16 +84,6 @@ impl Validator for ChainValidator {
steps_iter.try_fold(value, |v, step| step.validate(py, v.into_ref(py), state, definitions))
}

fn different_strict_behavior(
&self,
definitions: Option<&DefinitionsBuilder<CombinedValidator>>,
ultra_strict: bool,
) -> bool {
self.steps
.iter()
.any(|v| v.different_strict_behavior(definitions, ultra_strict))
}

fn get_name(&self) -> &str {
&self.name
}
Expand Down
8 changes: 0 additions & 8 deletions src/validators/custom_error.rs
Expand Up @@ -100,14 +100,6 @@ impl Validator for CustomErrorValidator {
.map_err(|_| self.custom_error.as_val_error(input))
}

fn different_strict_behavior(
&self,
definitions: Option<&DefinitionsBuilder<CombinedValidator>>,
ultra_strict: bool,
) -> bool {
self.validator.different_strict_behavior(definitions, ultra_strict)
}

fn get_name(&self) -> &str {
&self.name
}
Expand Down
22 changes: 0 additions & 22 deletions src/validators/dataclass.rs
Expand Up @@ -382,16 +382,6 @@ impl Validator for DataclassArgsValidator {
}
}

fn different_strict_behavior(
&self,
definitions: Option<&DefinitionsBuilder<CombinedValidator>>,
ultra_strict: bool,
) -> bool {
self.fields
.iter()
.any(|f| f.validator.different_strict_behavior(definitions, ultra_strict))
}

fn get_name(&self) -> &str {
&self.validator_name
}
Expand Down Expand Up @@ -547,18 +537,6 @@ impl Validator for DataclassValidator {
Ok(obj.to_object(py))
}

fn different_strict_behavior(
&self,
definitions: Option<&DefinitionsBuilder<CombinedValidator>>,
ultra_strict: bool,
) -> bool {
if ultra_strict {
self.validator.different_strict_behavior(definitions, ultra_strict)
} else {
true
}
}

fn get_name(&self) -> &str {
&self.name
}
Expand Down
8 changes: 0 additions & 8 deletions src/validators/date.rs
Expand Up @@ -98,14 +98,6 @@ impl Validator for DateValidator {
Ok(date.try_into_py(py)?)
}

fn different_strict_behavior(
&self,
_definitions: Option<&DefinitionsBuilder<CombinedValidator>>,
ultra_strict: bool,
) -> bool {
!ultra_strict
}

fn get_name(&self) -> &str {
Self::EXPECTED_TYPE
}
Expand Down
8 changes: 0 additions & 8 deletions src/validators/datetime.rs
Expand Up @@ -127,14 +127,6 @@ impl Validator for DateTimeValidator {
Ok(datetime.try_into_py(py)?)
}

fn different_strict_behavior(
&self,
_definitions: Option<&DefinitionsBuilder<CombinedValidator>>,
ultra_strict: bool,
) -> bool {
!ultra_strict
}

fn get_name(&self) -> &str {
Self::EXPECTED_TYPE
}
Expand Down
8 changes: 0 additions & 8 deletions src/validators/decimal.rs
Expand Up @@ -225,14 +225,6 @@ impl Validator for DecimalValidator {
Ok(decimal.into())
}

fn different_strict_behavior(
&self,
_definitions: Option<&DefinitionsBuilder<CombinedValidator>>,
_ultra_strict: bool,
) -> bool {
true
}

fn get_name(&self) -> &str {
Self::EXPECTED_TYPE
}
Expand Down
14 changes: 0 additions & 14 deletions src/validators/definitions.rs
Expand Up @@ -127,20 +127,6 @@ impl Validator for DefinitionRefValidator {
}
}

fn different_strict_behavior(
&self,
definitions: Option<&DefinitionsBuilder<CombinedValidator>>,
ultra_strict: bool,
) -> bool {
if let Some(definitions) = definitions {
// have to unwrap here, because we can't return an error from this function, should be okay
let validator = definitions.get_definition(self.validator_id).unwrap();
validator.different_strict_behavior(None, ultra_strict)
} else {
false
}
}

fn get_name(&self) -> &str {
&self.inner_name
}
Expand Down
13 changes: 0 additions & 13 deletions src/validators/dict.rs
Expand Up @@ -87,19 +87,6 @@ impl Validator for DictValidator {
}
}

fn different_strict_behavior(
&self,
definitions: Option<&DefinitionsBuilder<CombinedValidator>>,
ultra_strict: bool,
) -> bool {
if ultra_strict {
self.key_validator.different_strict_behavior(definitions, true)
|| self.value_validator.different_strict_behavior(definitions, true)
} else {
true
}
}

fn get_name(&self) -> &str {
&self.name
}
Expand Down
16 changes: 0 additions & 16 deletions src/validators/float.rs
Expand Up @@ -76,14 +76,6 @@ impl Validator for FloatValidator {
Ok(either_float.into_py(py))
}

fn different_strict_behavior(
&self,
_definitions: Option<&DefinitionsBuilder<CombinedValidator>>,
_ultra_strict: bool,
) -> bool {
true
}

fn get_name(&self) -> &str {
Self::EXPECTED_TYPE
}
Expand Down Expand Up @@ -179,14 +171,6 @@ impl Validator for ConstrainedFloatValidator {
Ok(either_float.into_py(py))
}

fn different_strict_behavior(
&self,
_definitions: Option<&DefinitionsBuilder<CombinedValidator>>,
_ultra_strict: bool,
) -> bool {
true
}

fn get_name(&self) -> &str {
"constrained-float"
}
Expand Down
12 changes: 0 additions & 12 deletions src/validators/frozenset.rs
Expand Up @@ -51,18 +51,6 @@ impl Validator for FrozenSetValidator {
Ok(f_set.into_py(py))
}

fn different_strict_behavior(
&self,
definitions: Option<&DefinitionsBuilder<CombinedValidator>>,
ultra_strict: bool,
) -> bool {
if ultra_strict {
self.item_validator.different_strict_behavior(definitions, true)
} else {
true
}
}

fn get_name(&self) -> &str {
&self.name
}
Expand Down
34 changes: 0 additions & 34 deletions src/validators/function.rs
Expand Up @@ -119,19 +119,6 @@ macro_rules! impl_validator {
self._validate(validate, py, obj, state)
}

fn different_strict_behavior(
&self,
definitions: Option<&DefinitionsBuilder<CombinedValidator>>,
ultra_strict: bool,
) -> bool {
if ultra_strict {
self.validator
.different_strict_behavior(definitions, ultra_strict)
} else {
true
}
}

fn get_name(&self) -> &str {
&self.name
}
Expand Down Expand Up @@ -264,15 +251,6 @@ impl Validator for FunctionPlainValidator {
r.map_err(|e| convert_err(py, e, input))
}

fn different_strict_behavior(
&self,
_definitions: Option<&DefinitionsBuilder<CombinedValidator>>,
ultra_strict: bool,
) -> bool {
// best guess, should we change this?
!ultra_strict
}

fn get_name(&self) -> &str {
&self.name
}
Expand Down Expand Up @@ -397,18 +375,6 @@ impl Validator for FunctionWrapValidator {
self._validate(Py::new(py, handler)?.into_ref(py), py, obj, state)
}

fn different_strict_behavior(
&self,
definitions: Option<&DefinitionsBuilder<CombinedValidator>>,
ultra_strict: bool,
) -> bool {
if ultra_strict {
self.validator.different_strict_behavior(definitions, ultra_strict)
} else {
true
}
}

fn get_name(&self) -> &str {
&self.name
}
Expand Down
12 changes: 0 additions & 12 deletions src/validators/generator.rs
Expand Up @@ -83,18 +83,6 @@ impl Validator for GeneratorValidator {
Ok(v_iterator.into_py(py))
}

fn different_strict_behavior(
&self,
definitions: Option<&DefinitionsBuilder<CombinedValidator>>,
ultra_strict: bool,
) -> bool {
if let Some(ref v) = self.item_validator {
v.different_strict_behavior(definitions, ultra_strict)
} else {
false
}
}

fn get_name(&self) -> &str {
&self.name
}
Expand Down

0 comments on commit b6df368

Please sign in to comment.