Add compatibility with 1.34

.github/workflows/main.yml

@@ -8,6 +8,13 @@ jobs:
  runs-on: ubuntu-latest
  steps:
  - uses: actions/checkout@v2
+ - uses: actions-rs/toolchain@v1
+ with:
+ profile: minimal
+ command: check
+ toolchain: "1.34.0"
+ override: true
+
  - uses: actions-rs/toolchain@v1
  with:
  profile: minimal

src/arena.rs

@@ -175,7 +175,7 @@ impl<T: Sized + Clone> Bucket<T> {
  self.index += slice.len();
 
  // Safety: The caller promises to forget the reference before the arena is dropped
- &*ptr::slice_from_raw_parts(ptr, slice.len())
+ target
  }
 }
 

src/lib.rs

@@ -1,5 +1,7 @@
 #![cfg_attr(feature = "no-std", no_std)]
 #![cfg_attr(feature = "nightly", feature(hash_raw_entry))]
+// `.copied()` was unstable in 1.34
+#![allow(clippy::map_clone)]
 #![warn(clippy::missing_inline_in_public_items)]
 #![deny(
  missing_docs,

src/reader.rs

@@ -7,7 +7,7 @@ use crate::{
  util::{Iter, Strings},
 };
 
-use core::{hash::BuildHasher, mem};
+use core::hash::BuildHasher;
 
 compile! {
  if #[feature = "no-std"] {
@@ -82,7 +82,7 @@ where
  where
  T: AsRef<V>,
  {
- self.map.get(val.as_ref()).copied()
+ self.map.get(val.as_ref()).map(|&k| k)
  }
 
  /// Resolves a string by its key. Only keys made by the current Resolver or the creator
@@ -251,27 +251,16 @@ where
  /// [`RodeoResolver`]: crate::RodeoResolver
  #[inline]
  #[must_use]
- pub fn into_resolver(mut self) -> RodeoResolver<V, K> {
- self.map.drain().for_each(drop);
+ pub fn into_resolver(self) -> RodeoResolver<V, K> {
+ let RodeoReader {
+ map: _map,
+ strings,
+ arena,
+ } = self;
 
  // Safety: The current reader no longer contains references to the strings
  // in the vec given to RodeoResolver
- unsafe { RodeoResolver::new(mem::take(&mut self.strings), mem::take(&mut self.arena)) }
- }
-}
-
-/// Deallocate the leaked strings interned by RodeoReader
-impl<V, K, S> Drop for RodeoReader<V, K, S>
-where
- V: Internable + ?Sized,
- K: Key,
- S: BuildHasher + Clone,
-{
- #[inline]
- fn drop(&mut self) {
- // Safety: There must not be any other references to the strings in the arena, so
- // all strings are drained before the arena can drop
- self.strings.drain(..).for_each(drop);
+ unsafe { RodeoResolver::new(strings, arena) }
  }
 }
 

src/single_threaded.rs

@@ -8,7 +8,7 @@ use crate::{
  util::{Iter, Strings},
 };
 
-use core::{hash::BuildHasher, mem};
+use core::hash::BuildHasher;
 
 compile! {
  if #[feature = "no-std"] {
@@ -297,7 +297,7 @@ where
  where
  T: AsRef<V>,
  {
- self.map.get(val.as_ref()).copied()
+ self.map.get(val.as_ref()).map(|&k| k)
  }
 
  /// Resolves a string by its key. Only keys made by the current Rodeo may be used
@@ -474,18 +474,15 @@ where
  /// [`RodeoReader`]: crate::RodeoReader
  #[inline]
  #[must_use]
- pub fn into_reader(mut self) -> RodeoReader<V, K, S> {
- let mut map = HashMap::with_capacity_and_hasher(self.map.len(), self.map.hasher().clone());
- map.extend(self.map.drain());
+ pub fn into_reader(self) -> RodeoReader<V, K, S> {
+ let Self {
+ map,
+ strings,
+ arena,
+ } = self;
 
  // Safety: No other references outside of `map` and `strings` to the interned strings exist
- unsafe {
- RodeoReader::new(
- map,
- mem::take(&mut self.strings),
- mem::take(&mut self.arena),
- )
- }
+ unsafe { RodeoReader::new(map, strings, arena) }
  }
 
  /// Consumes the current Rodeo, returning a [`RodeoResolver`] to allow contention-free access of the interner
@@ -509,11 +506,15 @@ where
  /// [`RodeoResolver`]: crate::RodeoResolver
  #[inline]
  #[must_use]
- pub fn into_resolver(mut self) -> RodeoResolver<V, K> {
- self.map.drain().for_each(drop);
+ pub fn into_resolver(self) -> RodeoResolver<V, K> {
+ let Rodeo {
+ map: _map,
+ strings,
+ arena,
+ } = self;
 
  // Safety: No other references to the strings exist
- unsafe { RodeoResolver::new(mem::take(&mut self.strings), mem::take(&mut self.arena)) }
+ unsafe { RodeoResolver::new(strings, arena) }
  }
 }
 
@@ -528,24 +529,6 @@ impl Default for Rodeo<str, Spur, RandomState> {
  }
 }
 
-/// Deallocate the leaked strings interned by Rodeo
-impl<V, K, S> Drop for Rodeo<V, K, S>
-where
- V: Internable + ?Sized,
- K: Key,
- S: BuildHasher + Clone,
-{
- #[inline]
- fn drop(&mut self) {
- // Clear the map to remove all other references to the strings in self.strings
- self.map.clear();
-
- // Safety: There must not be any other references to the strings in the arena, so
- // all strings are drained before the arena can drop
- self.strings.drain(..).for_each(drop);
- }
-}
-
 unsafe impl<V, K, S> Send for Rodeo<V, K, S>
 where
  V: Internable + ?Sized + Send,

src/util.rs

@@ -145,7 +145,7 @@ where
 
  #[inline]
  fn next(&mut self) -> Option<Self::Item> {
- self.iter.next().copied()
+ self.iter.next().map(|&k| k)
  }
 
  #[inline]