diff --git a/Cargo.lock b/Cargo.lock index e72baf8015..b4a1142ee0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -57,9 +57,9 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.6" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" [[package]] name = "anstyle-parse" @@ -137,14 +137,34 @@ dependencies = [ "log", "prettyplease", "proc-macro2", - "quote 1.0.36", + "quote 1.0.37", "regex", "rustc-hash", "shlex", - "syn 2.0.65", + "syn 2.0.77", "which", ] +[[package]] +name = "bindgen" +version = "0.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f49d8fed880d473ea71efb9bf597651e77201bdd4893efe54c9e5d65ae04ce6f" +dependencies = [ + "bitflags 2.5.0", + "cexpr", + "clang-sys", + "itertools 0.13.0", + "log", + "prettyplease", + "proc-macro2", + "quote 1.0.37", + "regex", + "rustc-hash", + "shlex", + "syn 2.0.77", +] + [[package]] name = "bit-set" version = "0.5.3" @@ -195,13 +215,13 @@ checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] name = "cc" -version = "1.0.104" +version = "1.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74b6a57f98764a267ff415d50a25e6e166f3831a5071af4995296ea97d210490" +checksum = "57b6a275aa2903740dc87da01c62040406b8812552e97129a63ea8850a17c6e6" dependencies = [ "jobserver", "libc", - "once_cell", + "shlex", ] [[package]] @@ -236,7 +256,7 @@ dependencies = [ name = "chuffed_rs" version = "0.1.0" dependencies = [ - "bindgen", + "bindgen 0.70.1", "cc", ] @@ -253,9 +273,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.8" +version = "4.5.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84b3edb18336f4df585bc9aa31dd99c036dfa5dc5e9a2939a722a188f3a8970d" +checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019" dependencies = [ "clap_builder", "clap_derive", @@ -263,9 +283,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.8" +version = "4.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1c09dd5ada6c6c78075d6fd0da3f90d8080651e2d6cc8eb2f1aaa4034ced708" +checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6" dependencies = [ "anstream", "anstyle", @@ -275,14 +295,14 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.8" +version = "4.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bac35c6dafb060fd4d275d9a4ffae97917c13a6327903a8be2153cd964f7085" +checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" dependencies = [ "heck 0.5.0", "proc-macro2", - "quote 1.0.36", - "syn 2.0.65", + "quote 1.0.37", + "syn 2.0.77", ] [[package]] @@ -332,8 +352,8 @@ version = "0.1.0" dependencies = [ "linkme", "proc-macro2", - "quote 1.0.36", - "syn 2.0.65", + "quote 1.0.37", + "syn 2.0.77", ] [[package]] @@ -386,9 +406,9 @@ dependencies = [ "fnv", "ident_case", "proc-macro2", - "quote 1.0.36", + "quote 1.0.37", "strsim 0.10.0", - "syn 2.0.65", + "syn 2.0.77", ] [[package]] @@ -398,8 +418,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" dependencies = [ "darling_core", - "quote 1.0.36", - "syn 2.0.65", + "quote 1.0.37", + "syn 2.0.77", ] [[package]] @@ -419,7 +439,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ "proc-macro2", - "quote 1.0.36", + "quote 1.0.37", "syn 1.0.109", ] @@ -430,7 +450,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "302ccf094df1151173bb6f5a2282fcd2f45accd5eae1bdf82dcbfefbc501ad5c" dependencies = [ "proc-macro2", - "quote 1.0.36", + "quote 1.0.37", "syn 1.0.109", ] @@ -462,8 +482,8 @@ name = "enum_compatability_macro" version = "0.1.0" dependencies = [ "itertools 0.13.0", - "quote 1.0.36", - "syn 2.0.65", + "quote 1.0.37", + "syn 2.0.77", ] [[package]] @@ -691,7 +711,7 @@ name = "kissat-sys" version = "0.1.2" source = "git+https://github.com/firefighterduck/kissat-rs?branch=main#f46851317ba316c3d9fa1c34ca4c3261f89e9647" dependencies = [ - "bindgen", + "bindgen 0.69.4", ] [[package]] @@ -716,9 +736,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.155" +version = "0.2.158" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" [[package]] name = "libloading" @@ -738,22 +758,22 @@ checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "linkme" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccb76662d78edc9f9bf56360d6919bdacc8b7761227727e5082f128eeb90bbf5" +checksum = "3c943daedff228392b791b33bba32e75737756e80a613e32e246c6ce9cbab20a" dependencies = [ "linkme-impl", ] [[package]] name = "linkme-impl" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8dccda732e04fa3baf2e17cf835bfe2601c7c2edafd64417c627dabae3a8cda" +checksum = "cb26336e6dc7cc76e7927d2c9e7e3bb376d7af65a6f56a0b16c47d18a9b1abc5" dependencies = [ "proc-macro2", - "quote 1.0.36", - "syn 2.0.65", + "quote 1.0.37", + "syn 2.0.77", ] [[package]] @@ -799,7 +819,7 @@ name = "minion_rs" version = "0.0.1" dependencies = [ "anyhow", - "bindgen", + "bindgen 0.70.1", "glob", "libc", "thiserror", @@ -903,7 +923,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d3928fb5db768cb86f891ff014f0144589297e3c6a1aba6ed7cecfdace270c7" dependencies = [ "proc-macro2", - "syn 2.0.65", + "syn 2.0.77", ] [[package]] @@ -948,7 +968,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9cf16337405ca084e9c78985114633b6827711d22b9e6ef6c6c0d665eb3f0b6e" dependencies = [ "proc-macro2", - "quote 1.0.36", + "quote 1.0.37", "syn 1.0.109", ] @@ -959,8 +979,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ff7ff745a347b87471d859a377a9a404361e7efc2a971d73424a6d183c0fc77" dependencies = [ "proc-macro2", - "quote 1.0.36", - "syn 2.0.65", + "quote 1.0.37", + "syn 2.0.77", ] [[package]] @@ -977,9 +997,9 @@ checksum = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a" [[package]] name = "quote" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -1043,9 +1063,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.5" +version = "1.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" dependencies = [ "aho-corasick", "memchr", @@ -1147,9 +1167,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1eee588578aff73f856ab961cd2f79e36bc45d7ded33a7562adba4667aecc0e" dependencies = [ "proc-macro2", - "quote 1.0.36", + "quote 1.0.37", "serde_derive_internals", - "syn 2.0.65", + "syn 2.0.77", ] [[package]] @@ -1160,22 +1180,22 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "serde" -version = "1.0.203" +version = "1.0.209" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.209" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" dependencies = [ "proc-macro2", - "quote 1.0.36", - "syn 2.0.65", + "quote 1.0.37", + "syn 2.0.77", ] [[package]] @@ -1185,8 +1205,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "330f01ce65a3a5fe59a60c82f3c9a024b573b8a6e875bd233fe5f934e71d54e3" dependencies = [ "proc-macro2", - "quote 1.0.36", - "syn 2.0.65", + "quote 1.0.37", + "syn 2.0.77", ] [[package]] @@ -1200,20 +1220,21 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.119" +version = "1.0.127" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8eddb61f0697cc3989c5d64b452f5488e2b8a60fd7d5076a3045076ffef8cb0" +checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] [[package]] name = "serde_with" -version = "3.8.2" +version = "3.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "079f3a42cd87588d924ed95b533f8d30a483388c4e400ab736a7058e34f16169" +checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857" dependencies = [ "base64", "chrono", @@ -1229,14 +1250,14 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.8.2" +version = "3.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc03aad67c1d26b7de277d51c86892e7d9a0110a2fe44bf6b26cc569fba302d6" +checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350" dependencies = [ "darling", "proc-macro2", - "quote 1.0.36", - "syn 2.0.65", + "quote 1.0.37", + "syn 2.0.77", ] [[package]] @@ -1300,9 +1321,9 @@ checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" dependencies = [ "heck 0.5.0", "proc-macro2", - "quote 1.0.36", + "quote 1.0.37", "rustversion", - "syn 2.0.65", + "syn 2.0.77", ] [[package]] @@ -1401,18 +1422,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ "proc-macro2", - "quote 1.0.36", + "quote 1.0.37", "unicode-ident", ] [[package]] name = "syn" -version = "2.0.65" +version = "2.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2863d96a84c6439701d7a38f9de935ec562c8832cc55d1dde0f513b52fad106" +checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" dependencies = [ "proc-macro2", - "quote 1.0.36", + "quote 1.0.37", "unicode-ident", ] @@ -1439,22 +1460,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.61" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.61" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", - "quote 1.0.36", - "syn 2.0.65", + "quote 1.0.37", + "syn 2.0.77", ] [[package]] @@ -1557,8 +1578,8 @@ version = "0.1.0" dependencies = [ "log", "proc-macro2", - "quote 1.0.36", - "syn 2.0.65", + "quote 1.0.37", + "syn 2.0.77", "uniplate 0.1.0", ] @@ -1569,8 +1590,8 @@ source = "git+https://github.com/conjure-cp/conjure-oxide.git?rev=0dc7090f0388d9 dependencies = [ "log", "proc-macro2", - "quote 1.0.36", - "syn 2.0.65", + "quote 1.0.37", + "syn 2.0.77", "uniplate 0.1.0 (git+https://github.com/conjure-cp/conjure-oxide.git?rev=0dc7090f0388d9a4fc0460d7d5fbf79da7854170)", ] @@ -1624,9 +1645,9 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "versions" -version = "6.3.0" +version = "6.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fc28d1172a20e32754969ea1a873c2c6e68e36c449c6056aa3e2ee5fe69a794" +checksum = "f25d498b63d1fdb376b4250f39ab3a5ee8d103957346abacd911e2d8b612c139" dependencies = [ "itertools 0.13.0", "nom", @@ -1677,8 +1698,8 @@ dependencies = [ "log", "once_cell", "proc-macro2", - "quote 1.0.36", - "syn 2.0.65", + "quote 1.0.37", + "syn 2.0.77", "wasm-bindgen-shared", ] @@ -1688,7 +1709,7 @@ version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ - "quote 1.0.36", + "quote 1.0.37", "wasm-bindgen-macro-support", ] @@ -1699,8 +1720,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", - "quote 1.0.36", - "syn 2.0.65", + "quote 1.0.37", + "syn 2.0.77", "wasm-bindgen-backend", "wasm-bindgen-shared", ] diff --git a/conjure_oxide/Cargo.toml b/conjure_oxide/Cargo.toml index 7db12e5f9c..21a7d2938b 100644 --- a/conjure_oxide/Cargo.toml +++ b/conjure_oxide/Cargo.toml @@ -12,19 +12,19 @@ walkdir = "2.5.0" conjure_core = { path = "../crates/conjure_core" } uniplate = { git = "https://github.com/conjure-cp/conjure-oxide.git", rev = "0dc7090f0388d9a4fc0460d7d5fbf79da7854170" } uniplate_derive = { git = "https://github.com/conjure-cp/conjure-oxide.git", rev = "0dc7090f0388d9a4fc0460d7d5fbf79da7854170" } -serde = { version = "1.0.203", features = ["derive"] } -serde_json = "1.0.119" -serde_with = "3.8.2" -thiserror = "1.0.61" +serde = { version = "1.0.209", features = ["derive"] } +serde_json = "1.0.127" +serde_with = "3.9.0" +thiserror = "1.0.63" minion_rs = { path = "../solvers/minion" } anyhow = "1.0.86" -clap = { version = "4.5.8", features = ["derive"] } +clap = { version = "4.5.16", features = ["derive"] } strum_macros = "0.26.4" strum = "0.26.3" -versions = "6.3.0" -linkme = "0.3.27" +versions = "6.3.2" +linkme = "0.3.28" walkdir = "2.5.0" -regex = "1.10.5" +regex = "1.10.6" log = "0.4.22" structured-logger = "1.0.3" schemars = "0.8.21" diff --git a/crates/conjure_core/Cargo.toml b/crates/conjure_core/Cargo.toml index e7227f2d4e..b3241b5115 100644 --- a/crates/conjure_core/Cargo.toml +++ b/crates/conjure_core/Cargo.toml @@ -10,21 +10,21 @@ uniplate = { git = "https://github.com/conjure-cp/conjure-oxide.git", rev = "0dc uniplate_derive = { git = "https://github.com/conjure-cp/conjure-oxide.git", rev = "0dc7090f0388d9a4fc0460d7d5fbf79da7854170" } minion_rs = { path = "../../solvers/minion" } project-root = "0.2.2" -linkme = "0.3.27" -serde = { version = "1.0.203", features = ["derive"] } -serde_json = "1.0.119" -serde_with = "3.8.2" +linkme = "0.3.28" +serde = { version = "1.0.209", features = ["derive"] } +serde_json = "1.0.127" +serde_with = "3.9.0" strum = "0.26.3" strum_macros = "0.26.4" -thiserror = "1.0.61" +thiserror = "1.0.63" derive_is_enum_variant = "0.1.1" log = "0.4.22" anyhow = "1.0.86" -regex = "1.10.5" +regex = "1.10.6" walkdir = "2.5.0" derivative = "2.2.0" schemars = "0.8.21" -clap = { version = "4.5.8", features = ["derive"] } +clap = { version = "4.5.16", features = ["derive"] } itertools = "0.13.0" im = "15.1.0" diff --git a/crates/conjure_macros/Cargo.toml b/crates/conjure_macros/Cargo.toml index 4079c13a33..5f43cbe437 100644 --- a/crates/conjure_macros/Cargo.toml +++ b/crates/conjure_macros/Cargo.toml @@ -7,10 +7,10 @@ edition = "2021" proc_macro = true [dependencies] -quote = "1.0.36" -syn = { version = "2.0.65", features = ["full"] } +quote = "1.0.37" +syn = { version = "2.0.77", features = ["full"] } proc-macro2 = "1.0.86" -linkme = "0.3.27" +linkme = "0.3.28" [lints] workspace = true diff --git a/crates/enum_compatability_macro/Cargo.toml b/crates/enum_compatability_macro/Cargo.toml index 04322e93b8..b4ab1136b2 100644 --- a/crates/enum_compatability_macro/Cargo.toml +++ b/crates/enum_compatability_macro/Cargo.toml @@ -8,8 +8,8 @@ edition = "2021" proc_macro = true [dependencies] -quote = "1.0.36" -syn = { version = "2.0.65", features = ["parsing","visit-mut","full"] } +quote = "1.0.37" +syn = { version = "2.0.77", features = ["parsing","visit-mut","full"] } itertools = "0.13" [lints] diff --git a/crates/uniplate/Cargo.toml b/crates/uniplate/Cargo.toml index 0776800a73..7f146f660d 100644 --- a/crates/uniplate/Cargo.toml +++ b/crates/uniplate/Cargo.toml @@ -11,7 +11,7 @@ license = "MPL-2.0" im = {version = "15.1.0", features = ["proptest"]} proptest = "1.5.0" proptest-derive = "0.5.0" -thiserror = "1.0.61" +thiserror = "1.0.63" [lints] workspace = true diff --git a/crates/uniplate_derive/Cargo.toml b/crates/uniplate_derive/Cargo.toml index e173f51dbb..ab55925925 100644 --- a/crates/uniplate_derive/Cargo.toml +++ b/crates/uniplate_derive/Cargo.toml @@ -10,8 +10,8 @@ proc-macro = true [dependencies] proc-macro2 = "1.0.86" -syn = "2.0.65" -quote = "1.0.36" +syn = "2.0.77" +quote = "1.0.37" log = "0.4.22" uniplate = {path = "../uniplate"} diff --git a/solvers/chuffed/Cargo.toml b/solvers/chuffed/Cargo.toml index 77c31612a5..5fa268ce04 100644 --- a/solvers/chuffed/Cargo.toml +++ b/solvers/chuffed/Cargo.toml @@ -9,5 +9,5 @@ edition = "2021" [dependencies] [build-dependencies] -cc = { version = "1.0.104", features = ["parallel"] } -bindgen = "0.69.4" +cc = { version = "1.1.15", features = ["parallel"] } +bindgen = "0.70.1" diff --git a/solvers/minion/Cargo.toml b/solvers/minion/Cargo.toml index cd359edeb6..3492157f3f 100644 --- a/solvers/minion/Cargo.toml +++ b/solvers/minion/Cargo.toml @@ -7,11 +7,11 @@ edition = "2021" [dependencies] anyhow = "1.0.86" -libc = "0.2.155" -thiserror = "1.0.61" +libc = "0.2.158" +thiserror = "1.0.63" [build-dependencies] -bindgen = "0.69.4" +bindgen = "0.70.1" glob = "0.3.1" [lints.clippy]