diff --git a/Cargo.toml b/Cargo.toml index 8fa74c6..7a185bd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -39,7 +39,7 @@ include = [ codecov = { repository = "orium/rpds", branch = "main", service = "github" } [dependencies] -archery = "1.0.0" +archery = { version = "1.1.0", features = ["triomphe"] } serde = { version = "1.0.149", optional = true, default-features = false } [dev-dependencies] diff --git a/README.md b/README.md index dcf3abb..958373f 100644 --- a/README.md +++ b/README.md @@ -317,7 +317,7 @@ crate to do this in a convenient way. The pointer type can be parameterized like this: ```rust -let vec: Vector = Vector::new_with_ptr_kind(); +let vec: Vector = Vector::new_with_ptr_kind(); // ↖ // This will use `Arc` pointers. // Change it to `archery::RcK` to use a `Rc` pointer. diff --git a/src/lib.rs b/src/lib.rs index 8ee0b64..cc34d1b 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -336,7 +336,7 @@ //! ```rust //! # use rpds::Vector; //! # -//! let vec: Vector = Vector::new_with_ptr_kind(); +//! let vec: Vector = Vector::new_with_ptr_kind(); //! // ↖ //! // This will use `Arc` pointers. //! // Change it to `archery::RcK` to use a `Rc` pointer. diff --git a/src/list/mod.rs b/src/list/mod.rs index 105c6b5..cf4e611 100644 --- a/src/list/mod.rs +++ b/src/list/mod.rs @@ -79,7 +79,7 @@ macro_rules! list { #[macro_export] macro_rules! list_sync { ($($e:expr),*) => { - $crate::list_reverse!(::archery::ArcK ; $($e),* ; ) + $crate::list_reverse!(::archery::ArcTK ; $($e),* ; ) }; } @@ -137,7 +137,7 @@ where } } -pub type ListSync = List; +pub type ListSync = List; impl ListSync { #[must_use] diff --git a/src/map/hash_trie_map/mod.rs b/src/map/hash_trie_map/mod.rs index a11953d..0ac44de 100644 --- a/src/map/hash_trie_map/mod.rs +++ b/src/map/hash_trie_map/mod.rs @@ -10,7 +10,7 @@ use crate::list; use crate::utils::DefaultBuildHasher; use crate::List; use alloc::vec::Vec; -use archery::{ArcK, RcK, SharedPointer, SharedPointerKind}; +use archery::{ArcTK, RcK, SharedPointer, SharedPointerKind}; use core::borrow::Borrow; use core::fmt::Display; use core::hash::BuildHasher; @@ -126,7 +126,7 @@ where hasher_builder: H, } -pub type HashTrieMapSync = HashTrieMap; +pub type HashTrieMapSync = HashTrieMap; /// This map works like a trie that breaks the hash of the key in segments, and the segments are /// used as the index in the trie branches. diff --git a/src/map/red_black_tree_map/mod.rs b/src/map/red_black_tree_map/mod.rs index 75e03dc..7092192 100644 --- a/src/map/red_black_tree_map/mod.rs +++ b/src/map/red_black_tree_map/mod.rs @@ -4,7 +4,7 @@ */ use super::entry::Entry; -use archery::{ArcK, RcK, SharedPointer, SharedPointerKind}; +use archery::{ArcTK, RcK, SharedPointer, SharedPointerKind}; use core::borrow::Borrow; use core::cmp::Ordering; use core::fmt::Display; @@ -113,7 +113,7 @@ where size: usize, } -pub type RedBlackTreeMapSync = RedBlackTreeMap; +pub type RedBlackTreeMapSync = RedBlackTreeMap; #[derive(Clone, Copy, Debug, PartialEq, Eq)] enum Color { diff --git a/src/queue/mod.rs b/src/queue/mod.rs index dd56ed0..2531856 100644 --- a/src/queue/mod.rs +++ b/src/queue/mod.rs @@ -107,7 +107,7 @@ where out_list: List, } -pub type QueueSync = Queue; +pub type QueueSync = Queue; impl QueueSync { #[must_use] diff --git a/src/set/hash_trie_set/mod.rs b/src/set/hash_trie_set/mod.rs index 66e910a..8f439a9 100644 --- a/src/set/hash_trie_set/mod.rs +++ b/src/set/hash_trie_set/mod.rs @@ -6,7 +6,7 @@ use crate::map::hash_trie_map; use crate::utils::DefaultBuildHasher; use crate::HashTrieMap; -use archery::{ArcK, RcK, SharedPointerKind}; +use archery::{ArcTK, RcK, SharedPointerKind}; use core::borrow::Borrow; use core::fmt::Display; use core::hash::BuildHasher; @@ -104,7 +104,7 @@ where map: HashTrieMap, } -pub type HashTrieSetSync = HashTrieSet; +pub type HashTrieSetSync = HashTrieSet; impl HashTrieSet where diff --git a/src/set/red_black_tree_set/mod.rs b/src/set/red_black_tree_set/mod.rs index f36f4ba..df30e91 100644 --- a/src/set/red_black_tree_set/mod.rs +++ b/src/set/red_black_tree_set/mod.rs @@ -5,7 +5,7 @@ use crate::map::red_black_tree_map; use crate::RedBlackTreeMap; -use archery::{ArcK, RcK, SharedPointerKind}; +use archery::{ArcTK, RcK, SharedPointerKind}; use core::borrow::Borrow; use core::cmp::Ordering; use core::fmt::Display; @@ -104,7 +104,7 @@ where map: RedBlackTreeMap, } -pub type RedBlackTreeSetSync = RedBlackTreeSet; +pub type RedBlackTreeSetSync = RedBlackTreeSet; impl RedBlackTreeSetSync where diff --git a/src/stack/mod.rs b/src/stack/mod.rs index f833b77..9ff4ff5 100644 --- a/src/stack/mod.rs +++ b/src/stack/mod.rs @@ -100,7 +100,7 @@ where list: List, } -pub type StackSync = Stack; +pub type StackSync = Stack; impl StackSync { #[must_use] diff --git a/src/vector/mod.rs b/src/vector/mod.rs index a06b40c..f3111fe 100644 --- a/src/vector/mod.rs +++ b/src/vector/mod.rs @@ -106,7 +106,7 @@ where length: usize, } -pub type VectorSync = Vector; +pub type VectorSync = Vector; #[derive(Debug)] enum Node