Skip to content

Commit

Permalink
Auto merge of #554 - Amanieu:remove-rkyv, r=Amanieu
Browse files Browse the repository at this point in the history
Remove rkyv support

Support will instead be directly provided by the `rkyv` crate via an optional feature.
  • Loading branch information
bors committed Sep 18, 2024
2 parents 23f1de1 + 73e5eca commit 4b0c778
Show file tree
Hide file tree
Showing 6 changed files with 0 additions and 257 deletions.
4 changes: 0 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@ ahash = { version = "0.8.7", default-features = false, optional = true }
# For external trait impls
rayon = { version = "1.0", optional = true }
serde = { version = "1.0.25", default-features = false, optional = true }
rkyv = { version = "0.7.42", optional = true, default-features = false, features = [
"alloc",
] }
borsh = { version = "1.5.0", default-features = false, optional = true, features = ["derive"]}

# When built as part of libstd
Expand All @@ -45,7 +42,6 @@ fnv = "1.0.7"
serde_test = "1.0"
doc-comment = "0.3.1"
bumpalo = { version = "3.13.0", features = ["allocator-api2"] }
rkyv = { version = "0.7.42", features = ["validation"] }

[features]
default = ["default-hasher", "inline-more", "allocator-api2", "equivalent", "raw-entry"]
Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,6 @@ This crate has the following Cargo features:
- `nightly`: Enables nightly-only features including: `#[may_dangle]`.
- `serde`: Enables serde serialization support.
- `borsh`: Enables borsh serialization support.
- `rkyv`: Enables rkyv serialization support.
- `rayon`: Enables rayon parallel iterator support.
- `equivalent`: Allows comparisons to be customized with the `Equivalent` trait.
- `raw-entry`: Enables access to the deprecated `RawEntry` API.
Expand Down
2 changes: 0 additions & 2 deletions src/external_trait_impls/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,5 @@
mod borsh;
#[cfg(feature = "rayon")]
pub(crate) mod rayon;
#[cfg(feature = "rkyv")]
mod rkyv;
#[cfg(feature = "serde")]
mod serde;
125 changes: 0 additions & 125 deletions src/external_trait_impls/rkyv/hash_map.rs

This file was deleted.

123 changes: 0 additions & 123 deletions src/external_trait_impls/rkyv/hash_set.rs

This file was deleted.

2 changes: 0 additions & 2 deletions src/external_trait_impls/rkyv/mod.rs

This file was deleted.

0 comments on commit 4b0c778

Please sign in to comment.