diff --git a/Cargo.toml b/Cargo.toml index e47805c..e00e3be 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,12 +5,13 @@ members = [ "uid-mux", "utils", "utils-aio", - "utils/fuzz", "websocket-relay", "futures-limit", "futures-plex", "web-spawn", "rand06-compat", + "rangeset", + "rangeset/fuzz", ] [workspace.dependencies] @@ -20,6 +21,7 @@ spansy = { path = "spansy" } tlsn-utils = { path = "utils" } tlsn-utils-aio = { path = "utils-aio" } uid-mux = { path = "uid-mux" } +rangeset = { path = "rangeset" } async-std = "1" async-trait = "0.1" diff --git a/rangeset/Cargo.toml b/rangeset/Cargo.toml new file mode 100644 index 0000000..e4bd0e1 --- /dev/null +++ b/rangeset/Cargo.toml @@ -0,0 +1,25 @@ +[package] +name = "rangeset" +version = "0.1.0" +edition = "2024" +authors = ["TLSNotary Contributors"] +license = "MIT OR Apache-2.0" +repository = "https://github.com/tlsnotary/tlsn-utils" +description = "Integer collection backed by ranges with set operation support." +keywords = ["range", "set"] + +[features] +default = [] +serde = ["dep:serde"] + +[dependencies] +serde = { workspace = true, optional = true, features = ["derive"] } + +[dev-dependencies] +criterion = { version = "0.5" } +rstest = "0.12" +itertools = "0.11.0" + +[[bench]] +name = "range" +harness = false diff --git a/rangeset/LICENSE-APACHE b/rangeset/LICENSE-APACHE new file mode 100644 index 0000000..23096e2 --- /dev/null +++ b/rangeset/LICENSE-APACHE @@ -0,0 +1,203 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright (c) 2016 Alex Crichton +Copyright (c) 2017 The Tokio Authors +Copyright (c) 2024 The TLSNotary authors + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. \ No newline at end of file diff --git a/rangeset/LICENSE-MIT b/rangeset/LICENSE-MIT new file mode 100644 index 0000000..9b51d6d --- /dev/null +++ b/rangeset/LICENSE-MIT @@ -0,0 +1,27 @@ +Copyright (c) 2016 Alex Crichton +Copyright (c) 2017 The Tokio Authors +Copyright (c) 2024 The TLSNotary authors + +Permission is hereby granted, free of charge, to any +person obtaining a copy of this software and associated +documentation files (the "Software"), to deal in the +Software without restriction, including without +limitation the rights to use, copy, modify, merge, +publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software +is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice +shall be included in all copies or substantial portions +of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF +ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED +TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A +PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT +SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR +IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/rangeset/README.md b/rangeset/README.md new file mode 100644 index 0000000..57813af --- /dev/null +++ b/rangeset/README.md @@ -0,0 +1,3 @@ +# rangeset + +This crate provides the `RangeSet` type which stores a collection of values as sorted disjoint ranges. diff --git a/utils/benches/range.rs b/rangeset/benches/range.rs similarity index 92% rename from utils/benches/range.rs rename to rangeset/benches/range.rs index 96df722..9993ac8 100644 --- a/utils/benches/range.rs +++ b/rangeset/benches/range.rs @@ -1,6 +1,6 @@ -use criterion::{black_box, criterion_group, criterion_main, Criterion}; +use criterion::{Criterion, black_box, criterion_group, criterion_main}; -use utils::range::{RangeSet, Subset}; +use rangeset::{RangeSet, Subset}; pub fn criterion_benchmark(c: &mut Criterion) { let mut rangeset_vec = Vec::new(); diff --git a/utils/fuzz/.gitignore b/rangeset/fuzz/.gitignore similarity index 100% rename from utils/fuzz/.gitignore rename to rangeset/fuzz/.gitignore diff --git a/utils/fuzz/Cargo.toml b/rangeset/fuzz/Cargo.toml similarity index 96% rename from utils/fuzz/Cargo.toml rename to rangeset/fuzz/Cargo.toml index 9d1ee18..6d01c5e 100644 --- a/utils/fuzz/Cargo.toml +++ b/rangeset/fuzz/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "tlsn-utils-fuzz" +name = "rangeset-fuzz" version = "0.0.0" publish = false edition = "2021" @@ -10,7 +10,7 @@ cargo-fuzz = true [dependencies] libfuzzer-sys = { version = "0.4", features = ["arbitrary-derive"] } -[dependencies.tlsn-utils] +[dependencies.rangeset] path = ".." [profile.release] diff --git a/utils/fuzz/fuzz_targets/range_diff_range.rs b/rangeset/fuzz/fuzz_targets/range_diff_range.rs similarity index 89% rename from utils/fuzz/fuzz_targets/range_diff_range.rs rename to rangeset/fuzz/fuzz_targets/range_diff_range.rs index 1800c25..10153c2 100644 --- a/utils/fuzz/fuzz_targets/range_diff_range.rs +++ b/rangeset/fuzz/fuzz_targets/range_diff_range.rs @@ -4,8 +4,8 @@ use std::ops::Range; use libfuzzer_sys::fuzz_target; -use tlsn_utils_fuzz::assert_invariants; -use utils::range::*; +use rangeset::*; +use rangeset_fuzz::assert_invariants; fn expected_range_difference(a: Range, b: Range) -> Vec { a.filter(|x| !b.contains(x)).collect::>() diff --git a/utils/fuzz/fuzz_targets/range_diff_set.rs b/rangeset/fuzz/fuzz_targets/range_diff_set.rs similarity index 88% rename from utils/fuzz/fuzz_targets/range_diff_set.rs rename to rangeset/fuzz/fuzz_targets/range_diff_set.rs index 0d70a83..ea7ff66 100644 --- a/utils/fuzz/fuzz_targets/range_diff_set.rs +++ b/rangeset/fuzz/fuzz_targets/range_diff_set.rs @@ -4,9 +4,9 @@ use std::ops::Range; use libfuzzer_sys::fuzz_target; -use tlsn_utils_fuzz::{assert_invariants, SmallSet}; +use rangeset_fuzz::{assert_invariants, SmallSet}; -use utils::range::*; +use rangeset::*; fn expected_difference(a: Range, b: RangeSet) -> Vec { a.filter(|x| !b.contains(x)).collect::>() diff --git a/utils/fuzz/fuzz_targets/range_intersection_set.rs b/rangeset/fuzz/fuzz_targets/range_intersection_set.rs similarity index 88% rename from utils/fuzz/fuzz_targets/range_intersection_set.rs rename to rangeset/fuzz/fuzz_targets/range_intersection_set.rs index 9f94cc7..1dc8927 100644 --- a/utils/fuzz/fuzz_targets/range_intersection_set.rs +++ b/rangeset/fuzz/fuzz_targets/range_intersection_set.rs @@ -5,9 +5,9 @@ use std::ops::Range; use libfuzzer_sys::fuzz_target; -use tlsn_utils_fuzz::{assert_invariants, SmallSet}; +use rangeset_fuzz::{assert_invariants, SmallSet}; -use utils::range::*; +use rangeset::*; fuzz_target!(|r: (Range, SmallSet)| { let s1 = r.0; diff --git a/utils/fuzz/fuzz_targets/range_subset_set.rs b/rangeset/fuzz/fuzz_targets/range_subset_set.rs similarity index 87% rename from utils/fuzz/fuzz_targets/range_subset_set.rs rename to rangeset/fuzz/fuzz_targets/range_subset_set.rs index 1dd5be1..16f83d0 100644 --- a/utils/fuzz/fuzz_targets/range_subset_set.rs +++ b/rangeset/fuzz/fuzz_targets/range_subset_set.rs @@ -5,9 +5,9 @@ use std::ops::Range; use libfuzzer_sys::fuzz_target; -use tlsn_utils_fuzz::SmallSet; +use rangeset_fuzz::SmallSet; -use utils::range::*; +use rangeset::*; fuzz_target!(|r: (Range, SmallSet)| { let s1 = r.0; diff --git a/utils/fuzz/fuzz_targets/range_union_range.rs b/rangeset/fuzz/fuzz_targets/range_union_range.rs similarity index 90% rename from utils/fuzz/fuzz_targets/range_union_range.rs rename to rangeset/fuzz/fuzz_targets/range_union_range.rs index 68f9732..12ec24a 100644 --- a/utils/fuzz/fuzz_targets/range_union_range.rs +++ b/rangeset/fuzz/fuzz_targets/range_union_range.rs @@ -4,8 +4,8 @@ use std::ops::Range; use libfuzzer_sys::fuzz_target; -use tlsn_utils_fuzz::assert_invariants; -use utils::range::*; +use rangeset::*; +use rangeset_fuzz::assert_invariants; fn expected_range_union(a: Range, b: Range) -> Vec { let mut expected_values = a.chain(b).collect::>(); diff --git a/utils/fuzz/fuzz_targets/range_union_set.rs b/rangeset/fuzz/fuzz_targets/range_union_set.rs similarity index 89% rename from utils/fuzz/fuzz_targets/range_union_set.rs rename to rangeset/fuzz/fuzz_targets/range_union_set.rs index 48a614e..1b28b63 100644 --- a/utils/fuzz/fuzz_targets/range_union_set.rs +++ b/rangeset/fuzz/fuzz_targets/range_union_set.rs @@ -4,9 +4,9 @@ use std::ops::Range; use libfuzzer_sys::fuzz_target; -use tlsn_utils_fuzz::{assert_invariants, SmallSet}; +use rangeset_fuzz::{assert_invariants, SmallSet}; -use utils::range::*; +use rangeset::*; fn expected_union(a: Range, b: RangeSet) -> Vec { let mut expected_values = a.chain(b.iter()).collect::>(); diff --git a/utils/fuzz/fuzz_targets/set_diff_range.rs b/rangeset/fuzz/fuzz_targets/set_diff_range.rs similarity index 88% rename from utils/fuzz/fuzz_targets/set_diff_range.rs rename to rangeset/fuzz/fuzz_targets/set_diff_range.rs index b360580..6242068 100644 --- a/utils/fuzz/fuzz_targets/set_diff_range.rs +++ b/rangeset/fuzz/fuzz_targets/set_diff_range.rs @@ -4,9 +4,9 @@ use std::ops::Range; use libfuzzer_sys::fuzz_target; -use tlsn_utils_fuzz::{assert_invariants, SmallSet}; +use rangeset_fuzz::{assert_invariants, SmallSet}; -use utils::range::*; +use rangeset::*; fn expected_difference(a: RangeSet, b: Range) -> Vec { a.iter().filter(|x| !b.contains(x)).collect::>() diff --git a/utils/fuzz/fuzz_targets/set_diff_set.rs b/rangeset/fuzz/fuzz_targets/set_diff_set.rs similarity index 88% rename from utils/fuzz/fuzz_targets/set_diff_set.rs rename to rangeset/fuzz/fuzz_targets/set_diff_set.rs index 54e5b37..bbe2dcd 100644 --- a/utils/fuzz/fuzz_targets/set_diff_set.rs +++ b/rangeset/fuzz/fuzz_targets/set_diff_set.rs @@ -2,9 +2,9 @@ use libfuzzer_sys::fuzz_target; -use tlsn_utils_fuzz::{assert_invariants, SmallSet}; +use rangeset_fuzz::{assert_invariants, SmallSet}; -use utils::range::*; +use rangeset::*; fn expected_difference(a: RangeSet, b: RangeSet) -> Vec { a.iter().filter(|x| !b.contains(x)).collect::>() diff --git a/utils/fuzz/fuzz_targets/set_intersection_set.rs b/rangeset/fuzz/fuzz_targets/set_intersection_set.rs similarity index 88% rename from utils/fuzz/fuzz_targets/set_intersection_set.rs rename to rangeset/fuzz/fuzz_targets/set_intersection_set.rs index c838ae3..dadb050 100644 --- a/utils/fuzz/fuzz_targets/set_intersection_set.rs +++ b/rangeset/fuzz/fuzz_targets/set_intersection_set.rs @@ -4,9 +4,9 @@ use std::collections::HashSet; use libfuzzer_sys::fuzz_target; -use tlsn_utils_fuzz::{assert_invariants, SmallSet}; +use rangeset_fuzz::{assert_invariants, SmallSet}; -use utils::range::*; +use rangeset::*; fuzz_target!(|r: (SmallSet, SmallSet)| { let s1: RangeSet = r.0.into(); diff --git a/utils/fuzz/fuzz_targets/set_subset_set.rs b/rangeset/fuzz/fuzz_targets/set_subset_set.rs similarity index 87% rename from utils/fuzz/fuzz_targets/set_subset_set.rs rename to rangeset/fuzz/fuzz_targets/set_subset_set.rs index cf9d1c1..1a561b3 100644 --- a/utils/fuzz/fuzz_targets/set_subset_set.rs +++ b/rangeset/fuzz/fuzz_targets/set_subset_set.rs @@ -4,9 +4,9 @@ use std::collections::HashSet; use libfuzzer_sys::fuzz_target; -use tlsn_utils_fuzz::SmallSet; +use rangeset_fuzz::SmallSet; -use utils::range::*; +use rangeset::*; fuzz_target!(|r: (SmallSet, SmallSet)| { let s1: RangeSet = r.0.into(); diff --git a/utils/fuzz/fuzz_targets/set_union_range.rs b/rangeset/fuzz/fuzz_targets/set_union_range.rs similarity index 89% rename from utils/fuzz/fuzz_targets/set_union_range.rs rename to rangeset/fuzz/fuzz_targets/set_union_range.rs index 0ab4d3a..6045f34 100644 --- a/utils/fuzz/fuzz_targets/set_union_range.rs +++ b/rangeset/fuzz/fuzz_targets/set_union_range.rs @@ -4,9 +4,9 @@ use std::ops::Range; use libfuzzer_sys::fuzz_target; -use tlsn_utils_fuzz::{assert_invariants, SmallSet}; +use rangeset_fuzz::{assert_invariants, SmallSet}; -use utils::range::*; +use rangeset::*; fn expected_union(a: RangeSet, b: Range) -> Vec { let mut expected_values = a.iter().chain(b).collect::>(); diff --git a/utils/fuzz/fuzz_targets/set_union_set.rs b/rangeset/fuzz/fuzz_targets/set_union_set.rs similarity index 89% rename from utils/fuzz/fuzz_targets/set_union_set.rs rename to rangeset/fuzz/fuzz_targets/set_union_set.rs index 1f57699..4b2e664 100644 --- a/utils/fuzz/fuzz_targets/set_union_set.rs +++ b/rangeset/fuzz/fuzz_targets/set_union_set.rs @@ -2,9 +2,9 @@ use libfuzzer_sys::fuzz_target; -use tlsn_utils_fuzz::{assert_invariants, SmallSet}; +use rangeset_fuzz::{assert_invariants, SmallSet}; -use utils::range::*; +use rangeset::*; fn expected_union(a: RangeSet, b: RangeSet) -> Vec { let mut expected_values = a.iter().chain(b.iter()).collect::>(); diff --git a/utils/fuzz/src/lib.rs b/rangeset/fuzz/src/lib.rs similarity index 98% rename from utils/fuzz/src/lib.rs rename to rangeset/fuzz/src/lib.rs index fcc2266..57bde56 100644 --- a/utils/fuzz/src/lib.rs +++ b/rangeset/fuzz/src/lib.rs @@ -2,7 +2,7 @@ use std::ops::Range; use libfuzzer_sys::arbitrary::{Arbitrary, Result, Unstructured}; -use utils::range::*; +use rangeset::*; #[derive(Debug)] pub struct SmallSet { diff --git a/utils/src/range/cover.rs b/rangeset/src/cover.rs similarity index 98% rename from utils/src/range/cover.rs rename to rangeset/src/cover.rs index 5b0188a..289f2fe 100644 --- a/utils/src/range/cover.rs +++ b/rangeset/src/cover.rs @@ -1,5 +1,5 @@ -use crate::range::{ - difference::DifferenceMut, intersection::Intersection, subset::Subset, Range, RangeSet, +use crate::{ + Range, RangeSet, difference::DifferenceMut, intersection::Intersection, subset::Subset, }; /// Set cover methods. diff --git a/utils/src/range/difference.rs b/rangeset/src/difference.rs similarity index 99% rename from utils/src/range/difference.rs rename to rangeset/src/difference.rs index eb8917f..27aa5de 100644 --- a/utils/src/range/difference.rs +++ b/rangeset/src/difference.rs @@ -1,6 +1,6 @@ use std::ops::{Range, Sub, SubAssign}; -use crate::range::{Disjoint, RangeSet, Subset}; +use crate::{Disjoint, RangeSet, Subset}; pub trait Difference { type Output; @@ -203,7 +203,7 @@ impl Sub<&RangeSet> for RangeSet { #[allow(clippy::all)] mod tests { use super::*; - use crate::range::Union; + use crate::Union; use itertools::iproduct; diff --git a/utils/src/range/index.rs b/rangeset/src/index.rs similarity index 98% rename from utils/src/range/index.rs rename to rangeset/src/index.rs index d9f7613..cdb3f90 100644 --- a/utils/src/range/index.rs +++ b/rangeset/src/index.rs @@ -14,7 +14,7 @@ pub trait IndexRanges { /// # Examples /// /// ``` - /// use utils::range::{RangeSet, IndexRanges}; + /// use rangeset::{RangeSet, IndexRanges}; /// /// let data = [1, 2, 3, 4, 5, 6, 7, 8, 9]; /// let index = RangeSet::from([(0..3), (5..8)]); diff --git a/utils/src/range/intersection.rs b/rangeset/src/intersection.rs similarity index 99% rename from utils/src/range/intersection.rs rename to rangeset/src/intersection.rs index 3399eed..9d63e89 100644 --- a/utils/src/range/intersection.rs +++ b/rangeset/src/intersection.rs @@ -1,6 +1,6 @@ use std::ops::{BitAnd, BitAndAssign}; -use crate::range::{Range, RangeSet}; +use crate::{Range, RangeSet}; pub trait Intersection { type Output; @@ -171,7 +171,7 @@ mod tests { use itertools::iproduct; - use crate::range::assert_invariants; + use crate::assert_invariants; use super::*; diff --git a/utils/src/range/mod.rs b/rangeset/src/lib.rs similarity index 97% rename from utils/src/range/mod.rs rename to rangeset/src/lib.rs index ad106fd..f1f9924 100644 --- a/utils/src/range/mod.rs +++ b/rangeset/src/lib.rs @@ -1,3 +1,5 @@ +#![doc = include_str!("../README.md")] + mod cover; mod difference; mod index; @@ -35,7 +37,7 @@ use std::ops::{Add, Range, Sub}; /// # Examples /// /// ``` -/// use utils::range::*; +/// use rangeset::*; /// /// let a = 10..20; /// @@ -436,7 +438,9 @@ macro_rules! impl_step { }; } -impl_step!(u8, u16, u32, u64, u128, usize, i8, i16, i32, i64, i128, isize); +impl_step!( + u8, u16, u32, u64, u128, usize, i8, i16, i32, i64, i128, isize +); impl Disjoint> for Range { fn is_disjoint(&self, other: &Range) -> bool { @@ -538,16 +542,18 @@ mod tests { let mut a = set.clone(); let b = a.split_off(&at); - assert!(a - .ranges - .last() - .map(|range| !range.is_empty()) - .unwrap_or(true)); - assert!(b - .ranges - .first() - .map(|range| !range.is_empty()) - .unwrap_or(true)); + assert!( + a.ranges + .last() + .map(|range| !range.is_empty()) + .unwrap_or(true) + ); + assert!( + b.ranges + .first() + .map(|range| !range.is_empty()) + .unwrap_or(true) + ); assert_eq!(a.len() + b.len(), set.len()); assert!(a.iter().chain(b.iter()).eq(set.iter())); } diff --git a/utils/src/range/subset.rs b/rangeset/src/subset.rs similarity index 99% rename from utils/src/range/subset.rs rename to rangeset/src/subset.rs index c9d87d0..bce9f59 100644 --- a/utils/src/range/subset.rs +++ b/rangeset/src/subset.rs @@ -1,4 +1,4 @@ -use crate::range::{Range, RangeSet}; +use crate::{Range, RangeSet}; pub trait Subset { /// Returns `true` if `self` is a subset of `other`. diff --git a/utils/src/range/symmetric_difference.rs b/rangeset/src/symmetric_difference.rs similarity index 97% rename from utils/src/range/symmetric_difference.rs rename to rangeset/src/symmetric_difference.rs index ea0e399..267d4c5 100644 --- a/utils/src/range/symmetric_difference.rs +++ b/rangeset/src/symmetric_difference.rs @@ -1,6 +1,6 @@ use std::ops::{BitXor, BitXorAssign, Range}; -use crate::range::{DifferenceMut, Intersection, RangeSet, UnionMut}; +use crate::{DifferenceMut, Intersection, RangeSet, UnionMut}; pub trait SymmetricDifferenceMut { /// Replaces `self` with the set symmetric difference of `self` and `other`. diff --git a/utils/src/range/union.rs b/rangeset/src/union.rs similarity index 99% rename from utils/src/range/union.rs rename to rangeset/src/union.rs index 6a06dc4..5836723 100644 --- a/utils/src/range/union.rs +++ b/rangeset/src/union.rs @@ -1,6 +1,6 @@ use std::ops::{BitOr, BitOrAssign, Range}; -use crate::range::{Disjoint, RangeSet, Subset}; +use crate::{Disjoint, RangeSet, Subset}; pub trait UnionMut { /// Replaces `self` with the set union of `self` and `other`. diff --git a/spansy/Cargo.toml b/spansy/Cargo.toml index f774a09..c1cac16 100644 --- a/spansy/Cargo.toml +++ b/spansy/Cargo.toml @@ -8,10 +8,10 @@ license = "MIT OR Apache-2.0" [features] default = [] -serde = ["dep:serde", "bytes/serde"] +serde = ["dep:serde", "bytes/serde", "rangeset/serde"] [dependencies] -tlsn-utils.workspace = true +rangeset = { workspace = true, version = "0.1" } bytes.workspace = true serde = { workspace = true, features = ["derive"], optional = true } diff --git a/spansy/src/http/types.rs b/spansy/src/http/types.rs index c601bee..f9c56ed 100644 --- a/spansy/src/http/types.rs +++ b/spansy/src/http/types.rs @@ -1,4 +1,4 @@ -use utils::range::{Difference, RangeSet, ToRangeSet}; +use rangeset::{Difference, RangeSet, ToRangeSet}; use crate::{json::JsonValue, Span, Spanned}; diff --git a/spansy/src/json/types.rs b/spansy/src/json/types.rs index f904d04..09dc6ba 100644 --- a/spansy/src/json/types.rs +++ b/spansy/src/json/types.rs @@ -1,6 +1,6 @@ use std::ops::{Index, Range}; -use utils::range::{Difference, RangeSet, ToRangeSet}; +use rangeset::{Difference, RangeSet, ToRangeSet}; use crate::{Span, Spanned}; @@ -443,7 +443,7 @@ impl_type!(KeyValue, span); #[cfg(test)] mod tests { - use utils::range::IndexRanges; + use rangeset::IndexRanges; use crate::json::parse_str; diff --git a/spansy/src/lib.rs b/spansy/src/lib.rs index 44876d6..b8474fe 100644 --- a/spansy/src/lib.rs +++ b/spansy/src/lib.rs @@ -11,7 +11,7 @@ pub(crate) mod helpers; pub mod http; pub mod json; -use utils::range::{RangeSet, ToRangeSet}; +use rangeset::{RangeSet, ToRangeSet}; /// A parsing error. #[derive(Debug, thiserror::Error)] diff --git a/utils/Cargo.toml b/utils/Cargo.toml index 034eef2..7697307 100644 --- a/utils/Cargo.toml +++ b/utils/Cargo.toml @@ -3,23 +3,5 @@ name = "tlsn-utils" version = "0.1.0" edition = "2021" -[features] -default = ["serde"] -serde = ["dep:serde"] - [lib] name = "utils" - -[dependencies] -serde = { workspace = true, optional = true, features = ["derive"] } - -[dev-dependencies] -criterion = { version = "0.5" } -rstest = "0.12" -rand = { workspace = true } -itertools = "0.11.0" - - -[[bench]] -name = "range" -harness = false diff --git a/utils/src/lib.rs b/utils/src/lib.rs index b89bf1c..b4a1b24 100644 --- a/utils/src/lib.rs +++ b/utils/src/lib.rs @@ -1,5 +1,4 @@ pub mod filter_drain; pub mod id; pub mod iter; -pub mod range; pub mod tuple;