From f0660342d79ed0575da8ae57d60d7d4363c90128 Mon Sep 17 00:00:00 2001 From: "Jip J. Dekker" Date: Mon, 8 Jun 2026 10:51:54 +1000 Subject: [PATCH] chore: update dependencies --- Cargo.lock | 8 ++++---- Cargo.toml | 12 ++++++------ src/fzn/primitives.rs | 6 +++--- src/serde_impl.rs | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 61c8882..f755fd0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -142,9 +142,9 @@ dependencies = [ [[package]] name = "rangelist" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2005c11e700bd122d87a5294e6753b4a4e85b99b8d6b97334ca2d8ecfd0e049" +checksum = "f29e404ad93c4ca7067453de0924a82e1144adfdb4afd24fa15aeac91ca8e4c3" [[package]] name = "redox_syscall" @@ -254,9 +254,9 @@ checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" [[package]] name = "winnow" -version = "0.7.15" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df79d97927682d2fd8adb29682d1140b343be4ac0f08fd68b7765d9c059d3945" +checksum = "0592e1c9d151f854e6fd382574c3a0855250e1d9b2f99d9281c6e6391af352f1" dependencies = [ "memchr", ] diff --git a/Cargo.toml b/Cargo.toml index 7b4afd2..b0fa7a5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,14 +22,14 @@ serde = ["dep:serde"] fzn = ["dep:winnow"] [dependencies] -serde = { version = "1.0", features = ["derive"], optional = true } -rangelist = { version = "0.4.0" } -winnow = { version = "0.7.15", optional = true } +serde = { version = "1.0.228", features = ["derive"], optional = true } +rangelist = { version = "0.5.0" } +winnow = { version = "1.0.3", optional = true } [dev-dependencies] -serde_json = "1.0" -expect-test = "1.4" -ustr = { version = "1.0", features = ["serde"] } +serde_json = "1.0.149" +expect-test = "1.5.1" +ustr = { version = "1.1.0", features = ["serde"] } [lints.rust] missing_debug_implementations = "warn" diff --git a/src/fzn/primitives.rs b/src/fzn/primitives.rs index 80adaf8..0b1d6f6 100644 --- a/src/fzn/primitives.rs +++ b/src/fzn/primitives.rs @@ -139,7 +139,7 @@ pub(super) fn interval_set<'source, Identifier, F, T>( elem_parser: impl Parser, T, ContextError> + Copy, ) -> impl Parser, RangeList, ContextError> where - T: PartialOrd + Copy + 'static, + T: PartialOrd + Copy + rangelist::Adjacent, { move |input: &mut Stream<'source, Identifier, F>| { separated_pair(token(elem_parser), token(".."), token(elem_parser)) @@ -210,13 +210,13 @@ pub(super) fn set<'source, Identifier, F, T>( elem_parser: impl Parser, T, ContextError> + Copy, ) -> impl Parser, RangeList, ContextError> where - T: PartialOrd + Copy + 'static, + T: PartialOrd + Copy + rangelist::Adjacent, { fn set_literal<'source, Identifier, F, T>( elem_parser: impl Parser, T, ContextError> + Copy, ) -> impl Parser, RangeList, ContextError> where - T: PartialOrd + Copy + 'static, + T: PartialOrd + Copy + rangelist::Adjacent, { move |input: &mut Stream<'source, Identifier, F>| { delimited_list("{", elem_parser, "}") diff --git a/src/serde_impl.rs b/src/serde_impl.rs index 67097e9..21a0a5a 100644 --- a/src/serde_impl.rs +++ b/src/serde_impl.rs @@ -57,7 +57,7 @@ pub(crate) enum VariableDomain { pub(crate) fn deserialize_set< 'de, D: Deserializer<'de>, - E: Copy + Deserialize<'de> + PartialOrd + 'static, + E: Copy + Deserialize<'de> + PartialOrd + 'static + rangelist::Adjacent, >( deserializer: D, ) -> Result, D::Error> {