Deps update

.github/workflows/ci.yml

@@ -18,7 +18,7 @@ jobs:
         # according to Cargo.toml. Test against beta and nightly Rust to get
         # early warning of any problems that might occur with the upcoming Rust
         # release. Ordered oldest Rust to newest Rust.
-        rust: [1.65.0, stable, beta, nightly]
+        rust: [1.71.0, stable, beta, nightly]
 
         # Test with no features, default features ("") and all features.
         # Ordered fewest features to most features.

Cargo.toml

@@ -9,28 +9,25 @@ keywords = ["routing", "bgp"]
 license = "BSD-3-Clause"
 name = "rotonda-store"
 repository = "https://github.com/NLnetLabs/rotonda-store/"
-version = "0.3.0-pre.3"
-rust-version = "1.65"
+version = "0.3.0-rc0"
+rust-version = "1.71"
 
 [dependencies]
-arc-swap = "^1.5"
+arc-swap        = "^1.6"
 crossbeam-epoch = "^0.9"
 crossbeam-utils = "^0.8"
-log = "^0.4"
-rotonda-macros = { version = "0.3.0-pre.3", git = "https://github.com/NLnetLabs/rotonda-macros.git" }
+log             = "^0.4"
+rotonda-macros  = { version = "^0.3" }
 
-routecore = { version = "0.4.0-dev", features = ["bgp", "bmp", "serde"], git = "https://github.com/NLnetLabs/routecore.git" }
-ansi_term = { version = "^0.12", optional = true }
-rustyline = { version = "^8", optional = true }
-csv = { version = "^1", optional = true }
-
-[build-dependencies]
-rustc_version = "^0.4"
+routecore   = { version = "0.4.0-rc0", features = ["bgp", "bmp", "serde"] }
+ansi_term   = { version = "^0.12", optional = true }
+rustyline   = { version = "^13", optional = true }
+csv         = { version = "^1", optional = true }
 
 [dev-dependencies]
-rand = "^0.8"
-env_logger = { version = "^0.9" }
-csv = { version = "^1" }
+rand        = "^0.8"
+env_logger  = { version = "^0.10" }
+csv         = { version = "^1" }
 
 [features]
 cli = ["ansi_term", "rustyline", "csv"]
@@ -39,4 +36,3 @@ default = []
 [[bin]]
 name = "cli"
 required-features = ["cli"]
-

src/bin/cli.rs

@@ -5,6 +5,7 @@ use rustyline::Editor;
 
 use rotonda_store::prelude::{*, multi::*};
 use rotonda_store::meta_examples::PrefixAs;
+use rustyline::history::DefaultHistory;
 
 use std::env;
 use std::error::Error;
@@ -83,7 +84,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     // let locks = tree_bitmap.acquire_prefixes_rwlock_read();
     let guard = &epoch::pin();
 
-    let mut rl = Editor::<()>::new();
+    let mut rl = Editor::<(), DefaultHistory>::new()?;
     if rl.load_history("/tmp/rotonda-store-history.txt").is_err() {
         println!("No previous history.");
     }
@@ -208,7 +209,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 
                 match ip {
                     Ok(ip) => {
-                        rl.add_history_entry(line.as_str());
+                        rl.add_history_entry(line.as_str())?;
                         println!("Searching for prefix: {}/{}", ip, len);
 
                         pfx = Prefix::new(ip, len);

src/local_array/node.rs

@@ -11,7 +11,7 @@ use log::trace;
 use super::bit_span::BitSpan;
 use super::store::iterators::SizedNodeMoreSpecificIter;
 use crate::local_array::store::iterators::SizedPrefixIter;
-pub use crate::local_array::query::*;
+
 pub use crate::local_array::tree::*;
 use crate::af::Zero;
 use crate::af::AddressFamily;

src/local_vec/mod.rs

@@ -6,8 +6,6 @@ pub mod store;
 
 pub(crate) use tree::TreeBitMap;
 
-pub use store::Store;
-
 #[macro_use]
 mod macros;
 

src/local_vec/storage_backend.rs

@@ -1,6 +1,5 @@
 use crate::node_id::{InMemNodeId, SortableNodeId};
 use crate::prefix_record::InternalPrefixRecord;
-pub use crate::stride::*;
 
 use crate::local_vec::tree::*;
 

src/local_vec/tests/full_table_single.rs

@@ -132,11 +132,11 @@ mod full_table {
             let mut not_found_counter = 0_u32;
             let mut inet_count = 0;
             let mut len_count = 0;
-            (0..inet_max).into_iter().for_each(|i_net| {
+            (0..inet_max).for_each(|i_net| {
                 len_count = 0;
-                (0..len_max).into_iter().for_each(|s_len| {
+                (0..len_max).for_each(|s_len| {
 
-                    (0..inet_max).into_iter().for_each(|ii_net| {
+                    (0..inet_max).for_each(|ii_net| {
                         let pfx = Prefix::new_relaxed(
                             std::net::Ipv4Addr::new(i_net, ii_net, 0, 0)
                                 .into(),

src/synth_int.rs

@@ -69,10 +69,7 @@ impl Binary for U256 {
 
 impl PartialOrd for U256 {
     fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        match (self.0, &other.0) {
-            (a, b) if &a > b => Some(self.0.cmp(&other.0)),
-            _ => Some(self.1.cmp(&other.1)),
-        }
+        Some(self.cmp(other))
     }
 }