Skip to content

Commit

Permalink
change number and integer set methods to use any value implementing i…
Browse files Browse the repository at this point in the history
…nto f64

Signed-off-by: Ryan Tate <[email protected]>
  • Loading branch information
Ryanmtate committed Aug 14, 2024
1 parent 89db3b2 commit 30910a4
Showing 1 changed file with 13 additions and 13 deletions.
26 changes: 13 additions & 13 deletions src/json_schema_validation.rs
Original file line number Diff line number Diff line change
Expand Up @@ -216,8 +216,8 @@ impl SchemaValidator {
/// If the instance is a number, then this keyword validates only if the instance is greater than or exactly equal to "minimum".
///
/// See: [https://json-schema.org/draft/2020-12/json-schema-validation#section-6.2.4](https://json-schema.org/draft/2020-12/json-schema-validation#section-6.2.4)
pub fn set_minimum(mut self, minimum: f64) -> Self {
self.minimum = Some(minimum);
pub fn set_minimum(mut self, minimum: impl Into<f64>) -> Self {
self.minimum = Some(minimum.into());
self
}

Expand All @@ -226,8 +226,8 @@ impl SchemaValidator {
/// If the instance is a number, then this keyword validates only if the instance is less than or exactly equal to "maximum".
///
/// See: [https://json-schema.org/draft/2020-12/json-schema-validation#section-6.2.2](https://json-schema.org/draft/2020-12/json-schema-validation#section-6.2.2)
pub fn set_maximum(mut self, maximum: f64) -> Self {
self.maximum = Some(maximum);
pub fn set_maximum(mut self, maximum: impl Into<f64>) -> Self {
self.maximum = Some(maximum.into());
self
}

Expand All @@ -236,8 +236,8 @@ impl SchemaValidator {
/// If the instance is a number, then the instance is valid only if it has a value strictly greater than (not equal to) "exclusiveMinimum".
///
/// See: [https://json-schema.org/draft/2020-12/json-schema-validation#section-6.2.5](https://json-schema.org/draft/2020-12/json-schema-validation#section-6.2.5)
pub fn set_exclusive_minimum(mut self, exclusive_minimum: f64) -> Self {
self.exclusive_minimum = Some(exclusive_minimum);
pub fn set_exclusive_minimum(mut self, exclusive_minimum: impl Into<f64>) -> Self {
self.exclusive_minimum = Some(exclusive_minimum.into());
self
}

Expand All @@ -246,8 +246,8 @@ impl SchemaValidator {
/// If the instance is a number, then the instance is valid only if it has a value strictly less than (not equal to) "exclusiveMaximum".
///
/// See: [https://json-schema.org/draft/2020-12/json-schema-validation#section-6.2.3](https://json-schema.org/draft/2020-12/json-schema-validation#section-6.2.3)
pub fn set_exclusive_maximum(mut self, exclusive_maximum: f64) -> Self {
self.exclusive_maximum = Some(exclusive_maximum);
pub fn set_exclusive_maximum(mut self, exclusive_maximum: impl Into<f64>) -> Self {
self.exclusive_maximum = Some(exclusive_maximum.into());
self
}

Expand All @@ -256,8 +256,8 @@ impl SchemaValidator {
/// If the instance is a number, then the instance is valid only if it has a value strictly greater than (not equal to) "exclusiveMinimum".
///
/// See: [https://json-schema.org/draft/2020-12/json-schema-validation#section-6.2.1](https://json-schema.org/draft/2020-12/json-schema-validation#section-6.2.1)
pub fn set_multiple_of(mut self, multiple_of: f64) -> Self {
self.multiple_of = Some(multiple_of);
pub fn set_multiple_of(mut self, multiple_of: impl Into<f64>) -> Self {
self.multiple_of = Some(multiple_of.into());
self
}

Expand Down Expand Up @@ -795,7 +795,7 @@ mod tests {

assert!(schema_validator.validate(&value).is_ok());

schema_validator = schema_validator.set_minimum(6.).set_maximum(9.);
schema_validator = schema_validator.set_minimum(6).set_maximum(9);

assert!(schema_validator.validate(&value).is_err());

Expand All @@ -804,8 +804,8 @@ mod tests {
assert!(schema_validator.validate(&value).is_ok());

schema_validator = schema_validator
.set_exclusive_minimum(6.)
.set_exclusive_maximum(9.);
.set_exclusive_minimum(6)
.set_exclusive_maximum(9);

assert!(schema_validator.validate(&value).is_err());

Expand Down

0 comments on commit 30910a4

Please sign in to comment.