Fix MSRV build (#292)

* Fix MSRV build

Criterion started pulling in new versions of `rayon` that have a more recent
MSRV than we do.

* Fix compilation error on newer rustc nightlies

* Fix new rustc warning about hidden lifetimes

* Fix test to use new Box allocator-api methods

`Box::into_raw` doesn't work with custom allocators anymore.

Author: fitzgen

Cargo.toml

@@ -53,6 +53,10 @@ serde = { version = "1.0.197", features = ["derive"] }
 serde_json = "1.0.115"
 blink-alloc = { version = "=0.3.1" }
 
+# Make sure that criterion pulls in a rayon that supports our MSRV.
+rayon = { version = "=1.10.0" }
+rayon-core = { version = "=1.12.1" }
+
 [features]
 default = []
 collections = []

src/collections/vec.rs

@@ -1581,7 +1581,7 @@ impl<'bump, T: 'bump> Vec<'bump, T> {
     /// v.drain(..);
     /// assert_eq!(v, &[]);
     /// ```
-    pub fn drain<R>(&mut self, range: R) -> Drain<T>
+    pub fn drain<'a, R>(&'a mut self, range: R) -> Drain<'a, 'bump, T>
     where
         R: RangeBounds<usize>,
     {
@@ -2383,7 +2383,11 @@ impl<'bump, T: 'bump> Vec<'bump, T> {
     /// assert_eq!(u, &[1, 2]);
     /// ```
     #[inline]
-    pub fn splice<R, I>(&mut self, range: R, replace_with: I) -> Splice<I::IntoIter>
+    pub fn splice<'a, R, I>(
+        &'a mut self,
+        range: R,
+        replace_with: I,
+    ) -> Splice<'a, 'bump, I::IntoIter>
     where
         R: RangeBounds<usize>,
         I: IntoIterator<Item = T>,
@@ -2761,7 +2765,11 @@ impl<'a, 'bump, T> FusedIterator for Drain<'a, 'bump, T> {}
 /// This struct is created by the [`Vec::splice`] method. See its
 /// documentation for more information.
 #[derive(Debug)]
-pub struct Splice<'a, 'bump, I: Iterator + 'a + 'bump> {
+pub struct Splice<'a, 'bump, I>
+where
+    I: Iterator,
+    I::Item: 'a + 'bump,
+{
     drain: Drain<'a, 'bump, I::Item>,
     replace_with: I,
 }

tests/all/tests.rs

@@ -221,10 +221,10 @@ fn test_chunk_capacity() {
 #[test]
 #[cfg(feature = "allocator_api")]
 fn miri_stacked_borrows_issue_247() {
-    let bump = bumpalo::Bump::new();
+    let bump = Bump::new();
 
-    let a = Box::into_raw(Box::new_in(1u8, &bump));
-    drop(unsafe { Box::from_raw_in(a, &bump) });
+    let (p, _) = Box::into_raw_with_allocator(Box::new_in(1u8, &bump));
+    drop(unsafe { Box::from_raw_in(p, &bump) });
 
-    let _b = Box::new_in(2u16, &bump);
+    let _q = Box::new_in(2u16, &bump);
 }