Skip to content

Commit 088726f

Browse files
authored
Updates ion-rs dependency to v0.18.1 (#188)
1 parent 26274d8 commit 088726f

File tree

6 files changed

+12
-10
lines changed

6 files changed

+12
-10
lines changed

ion-schema-tests-runner/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ proc-macro = true
99
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
1010

1111
[dependencies]
12-
ion-rs = "0.17.0"
12+
ion-rs = "0.18.1"
1313
ion-schema = { path = "../ion-schema" }
1414
quote = "1.0.21"
1515
syn = "1.0.102"

ion-schema/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ edition = "2021"
2222
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
2323

2424
[dependencies]
25-
ion-rs = "0.17.0"
25+
ion-rs = "0.18.1"
2626
thiserror = "1.0"
2727
num-bigint = "0.3"
2828
num-traits = "0.2"

ion-schema/src/constraint.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ use crate::types::TypeValidator;
1818
use crate::violation::{Violation, ViolationCode};
1919
use crate::IonSchemaElement;
2020
use ion_rs::element::Element;
21-
use ion_rs::ion_eq::IonEq;
21+
use ion_rs::IonData;
2222
use ion_rs::{Int, IonType};
2323
use num_traits::ToPrimitive;
2424
use regex::{Regex, RegexBuilder};
@@ -2042,9 +2042,11 @@ impl ConstraintValidator for ValidValuesConstraint {
20422042
},
20432043
ValidValue::Element(element) => {
20442044
// get value without annotations
2045-
let value = value.value();
2045+
let value: IonData<_> = value.value().into();
2046+
let actual_value: IonData<_> = element.value().into();
20462047

2047-
if element.value().ion_eq(value) {
2048+
// this comparison uses the Ion equivalence based on Ion specification
2049+
if actual_value == value {
20482050
return Ok(());
20492051
}
20502052
}

ion-schema/src/isl/isl_range.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use ion_rs::element::writer::ElementWriter;
99
use ion_rs::element::Element;
1010
use ion_rs::external::bigdecimal::num_bigint::BigInt;
1111
use ion_rs::external::bigdecimal::{BigDecimal, One};
12-
use ion_rs::types::integer::IntAccess;
12+
use ion_rs::types::IntAccess;
1313
use ion_rs::{element, Decimal, Int, IonType, IonWriter, Timestamp};
1414
use std::cmp::Ordering;
1515
use std::fmt::{Display, Formatter};

ion-schema/src/isl/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -388,9 +388,9 @@ mod isl_tests {
388388
use crate::result::IonSchemaResult;
389389
use crate::system::SchemaSystem;
390390
use ion_rs::element::Element;
391-
use ion_rs::types::decimal::*;
392-
use ion_rs::types::integer::Int as IntegerValue;
393-
use ion_rs::types::timestamp::Timestamp;
391+
use ion_rs::types::Decimal;
392+
use ion_rs::types::Int as IntegerValue;
393+
use ion_rs::types::Timestamp;
394394
use ion_rs::Symbol;
395395
use ion_rs::{IonType, TextWriterBuilder};
396396
use rstest::*;

ion-schema/src/isl/util.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use crate::isl::{IslVersion, WriteToIsl};
33
use crate::result::{invalid_schema_error, IonSchemaError, IonSchemaResult};
44
use ion_rs::element::writer::ElementWriter;
55
use ion_rs::element::Element;
6-
use ion_rs::types::timestamp::Precision;
6+
use ion_rs::types::Precision;
77
use ion_rs::{IonWriter, Symbol, Timestamp};
88
use num_traits::abs;
99
use std::cmp::Ordering;

0 commit comments

Comments
 (0)