diff --git a/Cargo.lock b/Cargo.lock index aa1e87fe..51438a43 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 4 +version = 3 [[package]] name = "addr2line" @@ -67,15 +67,9 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" [[package]] name = "anstyle" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" - -[[package]] -name = "arrayvec" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" +checksum = "8365de52b16c035ff4fcafe0092ba9390540e3e352870ac09933bebcaa2c8c56" [[package]] name = "asn1-rs" @@ -295,12 +289,6 @@ version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" -[[package]] -name = "const_panic" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "013b6c2c3a14d678f38cd23994b02da3a1a1b6a5d1eedddfe63a5a5f11b13a81" - [[package]] name = "core-foundation-sys" version = "0.8.7" @@ -640,26 +628,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "konst" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50a0ba6de5f7af397afff922f22c149ff605c766cd3269cf6c1cd5e466dbe3b9" -dependencies = [ - "const_panic", - "konst_kernel", - "typewit", -] - -[[package]] -name = "konst_kernel" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be0a455a1719220fd6adf756088e1c69a85bf14b6a9e24537a5cc04f503edb2b" -dependencies = [ - "typewit", -] - [[package]] name = "lazy_static" version = "1.5.0" @@ -903,9 +871,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.88" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c3a7fc5db1e57d5a779a352c8cdb57b29aa4c40cc69c3a68a7fedc815fbf2f9" +checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e" dependencies = [ "unicode-ident", ] @@ -938,7 +906,6 @@ dependencies = [ name = "rasn" version = "0.20.2" dependencies = [ - "arrayvec", "bitvec", "bitvec-nom2", "bytes", @@ -947,7 +914,6 @@ dependencies = [ "either", "hashbrown", "iai-callgrind", - "konst", "nom", "num-bigint", "num-integer", @@ -1031,7 +997,6 @@ dependencies = [ "itertools 0.13.0", "proc-macro2", "quote", - "rayon", "syn", "uuid", ] @@ -1129,9 +1094,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.11.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", @@ -1220,18 +1185,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.211" +version = "1.0.214" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ac55e59090389fb9f0dd9e0f3c09615afed1d19094284d0b200441f13550793" +checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.211" +version = "1.0.214" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54be4f245ce16bc58d57ef2716271d0d4519e0f6defa147f6e081005bcb278ff" +checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766" dependencies = [ "proc-macro2", "quote", @@ -1311,9 +1276,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.82" +version = "2.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83540f837a8afc019423a8edb95b52a8effe46957ee402287f4292fae35be021" +checksum = "5023162dfcd14ef8f32034d8bcd4cc5ddc61ef7a247c024a33e24e1f24d21b56" dependencies = [ "proc-macro2", "quote", @@ -1339,18 +1304,18 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "thiserror" -version = "1.0.64" +version = "1.0.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" +checksum = "5d11abd9594d9b38965ef50805c5e469ca9cc6f197f883f717e0269a3057b3d5" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.64" +version = "1.0.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" +checksum = "ae71770322cbd277e69d762a16c444af02aa0575ac0d174f0b9562d3b37f8602" dependencies = [ "proc-macro2", "quote", @@ -1419,21 +1384,6 @@ dependencies = [ "syn", ] -[[package]] -name = "typewit" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fb9ae6a3cafaf0a5d14c2302ca525f9ae8e07a0f0e6949de88d882c37a6e24" -dependencies = [ - "typewit_proc_macros", -] - -[[package]] -name = "typewit_proc_macros" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36a83ea2b3c704935a01b4642946aadd445cea40b10935e3f8bd8052b8193d6" - [[package]] name = "unicode-ident" version = "1.0.13" diff --git a/Cargo.toml b/Cargo.toml index 8fcf380c..60962510 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -28,8 +28,6 @@ chrono = { version = "0.4.38", default-features = false, features = ["alloc"] } bitvec = { version = "1.0.1", default-features = false, features = ["alloc"] } [features] -default = ["macros"] -macros = ["rasn-derive"] std = [] backtraces = ["std", "snafu/backtrace"] compiler = ["rasn-compiler"] @@ -62,13 +60,11 @@ harness = false test = true [dependencies] -arrayvec = { version = "0.7.6", default-features = false } bitvec.workspace = true bytes = { version = "1.7.2", default-features = false } chrono.workspace = true either = { version = "1.13.0", default-features = false } hashbrown = "0.14.5" -konst = { version = "0.3.9", default-features = false } nom = { version = "7.1.3", default-features = false, features = ["alloc"] } nom-bitvec = { package = "bitvec-nom2", version = "0.2.1" } num-bigint = { version = "0.4.6", default-features = false } @@ -81,7 +77,7 @@ once_cell = { version = "1.20.2", default-features = false, features = [ "alloc", ] } rasn-compiler = { version = "0.5.3", optional = true } -rasn-derive = { version = "0.20", path = "macros", optional = true } +rasn-derive = { version = "0.20", path = "macros" } snafu = { version = "0.8.5", default-features = false, features = [ "rust_1_81", ] } diff --git a/macros/Cargo.toml b/macros/Cargo.toml index 8bebed33..ccbd7fbf 100644 --- a/macros/Cargo.toml +++ b/macros/Cargo.toml @@ -19,4 +19,3 @@ proc-macro2 = "1.0.88" itertools = "0.13" uuid = { version = "1.11.0", default-features = false, features = ["v4"] } either = { version = "1.13.0", default-features = false } -rayon = "1.10.0" diff --git a/macros/src/config.rs b/macros/src/config.rs index b2c34d50..dc025cc4 100644 --- a/macros/src/config.rs +++ b/macros/src/config.rs @@ -1254,14 +1254,12 @@ impl StringValue { values.push(StringRange::Range(start, end + is_inclusive as u32)); } } - let into_flat_set = |constraints: Vec<_>| { - use rayon::prelude::*; let mut set = constraints .iter() .flat_map(|from| match from { StringRange::Single(value) => vec![*value], - StringRange::Range(start, end) => (*start..*end).into_par_iter().collect(), + StringRange::Range(start, end) => (*start..*end).collect::>(), }) .collect::>(); set.sort(); diff --git a/src/types/tag.rs b/src/types/tag.rs index c7afa1f7..b79a0330 100644 --- a/src/types/tag.rs +++ b/src/types/tag.rs @@ -264,7 +264,7 @@ impl TagTree { while inner_index < inner_tags.len() { if Self::tree_contains( &inner_tags[inner_index], - konst::slice::slice_from(nodes, index + 1), + nodes.split_at(index + 1).1, ) { return false; } @@ -280,7 +280,7 @@ impl TagTree { return true; } - if Self::tag_contains(tag, konst::slice::slice_from(nodes, index + 1)) { + if Self::tag_contains(tag, nodes.split_at(index + 1).1) { return false; } }