FEAT: Implement a "MaybeUninit" and use it conditionally
Use a build script to detect if we can use MaybeUninit or NoDrop. Enabling unstable features automatically is not ideal, but since it's a soundness issue we should do it. Use a MaybeUninit-like union on nightly when we can. We use a feature detection script in build.rs, so that we also go back to the fallback if the unstable feature changes in an unexpected way. We need to continue to use NoDrop for best working stable implementation, but we eagerly use our union solution where we can, currently only in nightlies. Rustc feature probe code written by Josh Stone (cuviper), taken from num-bigint.
This commit is contained in:
+18
-20
@@ -7,14 +7,6 @@
|
||||
//! - Optional, enabled by default
|
||||
//! - Use libstd; disable to use `no_std` instead.
|
||||
//!
|
||||
//! - `use_union`
|
||||
//! - Optional
|
||||
//! - Requires Rust nightly channel
|
||||
//! - Experimental: This flag uses nightly so it *may break* unexpectedly
|
||||
//! at some point; since it doesn't change API this flag may also change
|
||||
//! to do nothing in the future.
|
||||
//! - Use the unstable feature untagged unions for the internal implementation,
|
||||
//! which may have reduced space overhead
|
||||
//! - `serde-1`
|
||||
//! - Optional
|
||||
//! - Enable serialization for ArrayVec and ArrayString using serde 1.0
|
||||
@@ -28,13 +20,17 @@
|
||||
//!
|
||||
#![doc(html_root_url="https://docs.rs/arrayvec/0.4/")]
|
||||
#![cfg_attr(not(feature="std"), no_std)]
|
||||
extern crate nodrop;
|
||||
#![cfg_attr(has_union_feature, feature(untagged_unions))]
|
||||
|
||||
#[cfg(feature="serde-1")]
|
||||
extern crate serde;
|
||||
|
||||
#[cfg(not(feature="std"))]
|
||||
extern crate core as std;
|
||||
|
||||
#[cfg(not(has_manually_drop_in_union))]
|
||||
extern crate nodrop;
|
||||
|
||||
use std::cmp;
|
||||
use std::iter;
|
||||
use std::mem;
|
||||
@@ -53,11 +49,14 @@ use std::fmt;
|
||||
#[cfg(feature="std")]
|
||||
use std::io;
|
||||
|
||||
#[cfg(not(feature="use_union"))]
|
||||
use nodrop::NoDrop;
|
||||
|
||||
#[cfg(feature="use_union")]
|
||||
use std::mem::ManuallyDrop as NoDrop;
|
||||
#[cfg(has_manually_drop_in_union)]
|
||||
mod maybe_uninit;
|
||||
#[cfg(not(has_manually_drop_in_union))]
|
||||
#[path="maybe_uninit_nodrop.rs"]
|
||||
mod maybe_uninit;
|
||||
|
||||
use maybe_uninit::MaybeUninit;
|
||||
|
||||
#[cfg(feature="serde-1")]
|
||||
use serde::{Serialize, Deserialize, Serializer, Deserializer};
|
||||
@@ -96,7 +95,7 @@ unsafe fn new_array<A: Array>() -> A {
|
||||
///
|
||||
/// ArrayVec can be converted into a by value iterator.
|
||||
pub struct ArrayVec<A: Array> {
|
||||
xs: NoDrop<A>,
|
||||
xs: MaybeUninit<A>,
|
||||
len: A::Index,
|
||||
}
|
||||
|
||||
@@ -133,7 +132,7 @@ impl<A: Array> ArrayVec<A> {
|
||||
/// ```
|
||||
pub fn new() -> ArrayVec<A> {
|
||||
unsafe {
|
||||
ArrayVec { xs: NoDrop::new(new_array()), len: Index::from(0) }
|
||||
ArrayVec { xs: MaybeUninit::uninitialized(), len: Index::from(0) }
|
||||
}
|
||||
}
|
||||
|
||||
@@ -517,7 +516,6 @@ impl<A: Array> ArrayVec<A> {
|
||||
self.len = Index::from(length);
|
||||
}
|
||||
|
||||
|
||||
/// Create a draining iterator that removes the specified range in the vector
|
||||
/// and yields the removed items from start to end. The element range is
|
||||
/// removed even if the iterator is not consumed until the end.
|
||||
@@ -577,7 +575,7 @@ impl<A: Array> ArrayVec<A> {
|
||||
Err(self)
|
||||
} else {
|
||||
unsafe {
|
||||
let array = ptr::read(&*self.xs);
|
||||
let array = ptr::read(self.xs.ptr() as *const A);
|
||||
mem::forget(self);
|
||||
Ok(array)
|
||||
}
|
||||
@@ -606,7 +604,7 @@ impl<A: Array> Deref for ArrayVec<A> {
|
||||
#[inline]
|
||||
fn deref(&self) -> &[A::Item] {
|
||||
unsafe {
|
||||
slice::from_raw_parts(self.xs.as_ptr(), self.len())
|
||||
slice::from_raw_parts(self.xs.ptr(), self.len())
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -616,7 +614,7 @@ impl<A: Array> DerefMut for ArrayVec<A> {
|
||||
fn deref_mut(&mut self) -> &mut [A::Item] {
|
||||
let len = self.len();
|
||||
unsafe {
|
||||
slice::from_raw_parts_mut(self.xs.as_mut_ptr(), len)
|
||||
slice::from_raw_parts_mut(self.xs.ptr_mut(), len)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -632,7 +630,7 @@ impl<A: Array> DerefMut for ArrayVec<A> {
|
||||
/// ```
|
||||
impl<A: Array> From<A> for ArrayVec<A> {
|
||||
fn from(array: A) -> Self {
|
||||
ArrayVec { xs: NoDrop::new(array), len: Index::from(A::capacity()) }
|
||||
ArrayVec { xs: MaybeUninit::from(array), len: Index::from(A::capacity()) }
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user