Made ArrayVec::new and ArrayString::new const fns
Added utils module with a `MaybeUninit` helper type to construct `[MaybeUninit<T>; N]` Removed all uses of the "unstable-const-fn" feature, and documented it as being deprecated. Changed `assert_capacity_limit` macro to work in const contexts.
This commit is contained in:
+2
-12
@@ -14,6 +14,7 @@ use std::str::Utf8Error;
|
|||||||
use crate::CapacityError;
|
use crate::CapacityError;
|
||||||
use crate::LenUint;
|
use crate::LenUint;
|
||||||
use crate::char::encode_utf8;
|
use crate::char::encode_utf8;
|
||||||
|
use crate::utils::MakeMaybeUninit;
|
||||||
|
|
||||||
#[cfg(feature="serde")]
|
#[cfg(feature="serde")]
|
||||||
use serde::{Serialize, Deserialize, Serializer, Deserializer};
|
use serde::{Serialize, Deserialize, Serializer, Deserializer};
|
||||||
@@ -58,20 +59,9 @@ impl<const CAP: usize> ArrayString<CAP>
|
|||||||
/// assert_eq!(&string[..], "foo");
|
/// assert_eq!(&string[..], "foo");
|
||||||
/// assert_eq!(string.capacity(), 16);
|
/// assert_eq!(string.capacity(), 16);
|
||||||
/// ```
|
/// ```
|
||||||
#[cfg(not(feature="unstable-const-fn"))]
|
|
||||||
pub fn new() -> ArrayString<CAP> {
|
|
||||||
assert_capacity_limit!(CAP);
|
|
||||||
unsafe {
|
|
||||||
ArrayString { xs: MaybeUninit::uninit().assume_init(), len: 0 }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(feature="unstable-const-fn")]
|
|
||||||
pub const fn new() -> ArrayString<CAP> {
|
pub const fn new() -> ArrayString<CAP> {
|
||||||
assert_capacity_limit!(CAP);
|
assert_capacity_limit!(CAP);
|
||||||
unsafe {
|
ArrayString { xs: MakeMaybeUninit::ARRAY, len: 0 }
|
||||||
ArrayString { xs: MaybeUninit::uninit().assume_init(), len: 0 }
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Return the length of the string.
|
/// Return the length of the string.
|
||||||
|
|||||||
+2
-12
@@ -23,6 +23,7 @@ use serde::{Serialize, Deserialize, Serializer, Deserializer};
|
|||||||
use crate::LenUint;
|
use crate::LenUint;
|
||||||
use crate::errors::CapacityError;
|
use crate::errors::CapacityError;
|
||||||
use crate::arrayvec_impl::ArrayVecImpl;
|
use crate::arrayvec_impl::ArrayVecImpl;
|
||||||
|
use crate::utils::MakeMaybeUninit;
|
||||||
|
|
||||||
/// A vector with a fixed capacity.
|
/// A vector with a fixed capacity.
|
||||||
///
|
///
|
||||||
@@ -76,20 +77,9 @@ impl<T, const CAP: usize> ArrayVec<T, CAP> {
|
|||||||
/// assert_eq!(&array[..], &[1, 2]);
|
/// assert_eq!(&array[..], &[1, 2]);
|
||||||
/// assert_eq!(array.capacity(), 16);
|
/// assert_eq!(array.capacity(), 16);
|
||||||
/// ```
|
/// ```
|
||||||
#[cfg(not(feature="unstable-const-fn"))]
|
|
||||||
pub fn new() -> ArrayVec<T, CAP> {
|
|
||||||
assert_capacity_limit!(CAP);
|
|
||||||
unsafe {
|
|
||||||
ArrayVec { xs: MaybeUninit::uninit().assume_init(), len: 0 }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(feature="unstable-const-fn")]
|
|
||||||
pub const fn new() -> ArrayVec<T, CAP> {
|
pub const fn new() -> ArrayVec<T, CAP> {
|
||||||
assert_capacity_limit!(CAP);
|
assert_capacity_limit!(CAP);
|
||||||
unsafe {
|
ArrayVec { xs: MakeMaybeUninit::ARRAY, len: 0 }
|
||||||
ArrayVec { xs: MaybeUninit::uninit().assume_init(), len: 0 }
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Return the number of elements in the `ArrayVec`.
|
/// Return the number of elements in the `ArrayVec`.
|
||||||
|
|||||||
+5
-7
@@ -11,11 +11,9 @@
|
|||||||
//! - Optional
|
//! - Optional
|
||||||
//! - Enable serialization for ArrayVec and ArrayString using serde 1.x
|
//! - Enable serialization for ArrayVec and ArrayString using serde 1.x
|
||||||
//!
|
//!
|
||||||
//! - `unstable-const-fn`
|
//! - `unstable-const-fn`: **deprecated**,
|
||||||
//! - Optional
|
//! used to be needed to make [`ArrayVec::new`] and [`ArrayString::new`] `const fn`s,
|
||||||
//! - Makes [`ArrayVec::new`] and [`ArrayString::new`] `const fn`s,
|
//! now they are always `const fn`s.
|
||||||
//! using the nightly `const_fn` feature.
|
|
||||||
//! - Unstable and requires nightly.
|
|
||||||
//!
|
//!
|
||||||
//! ## Rust Version
|
//! ## Rust Version
|
||||||
//!
|
//!
|
||||||
@@ -23,7 +21,6 @@
|
|||||||
//!
|
//!
|
||||||
#![doc(html_root_url="https://docs.rs/arrayvec/0.6/")]
|
#![doc(html_root_url="https://docs.rs/arrayvec/0.6/")]
|
||||||
#![cfg_attr(not(feature="std"), no_std)]
|
#![cfg_attr(not(feature="std"), no_std)]
|
||||||
#![cfg_attr(feature="unstable-const-fn", feature(const_fn, const_maybe_uninit_assume_init, const_panic))]
|
|
||||||
|
|
||||||
#[cfg(feature="serde")]
|
#[cfg(feature="serde")]
|
||||||
extern crate serde;
|
extern crate serde;
|
||||||
@@ -37,7 +34,7 @@ macro_rules! assert_capacity_limit {
|
|||||||
($cap:expr) => {
|
($cap:expr) => {
|
||||||
if std::mem::size_of::<usize>() > std::mem::size_of::<LenUint>() {
|
if std::mem::size_of::<usize>() > std::mem::size_of::<LenUint>() {
|
||||||
if $cap > LenUint::MAX as usize {
|
if $cap > LenUint::MAX as usize {
|
||||||
panic!("ArrayVec: largest supported capacity is u32::MAX")
|
[/*ArrayVec: largest supported capacity is u32::MAX*/][$cap]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -48,6 +45,7 @@ mod arrayvec;
|
|||||||
mod array_string;
|
mod array_string;
|
||||||
mod char;
|
mod char;
|
||||||
mod errors;
|
mod errors;
|
||||||
|
mod utils;
|
||||||
|
|
||||||
pub use crate::array_string::ArrayString;
|
pub use crate::array_string::ArrayString;
|
||||||
pub use crate::errors::CapacityError;
|
pub use crate::errors::CapacityError;
|
||||||
|
|||||||
@@ -0,0 +1,11 @@
|
|||||||
|
use std::marker::PhantomData;
|
||||||
|
use std::mem::MaybeUninit;
|
||||||
|
|
||||||
|
pub(crate) struct MakeMaybeUninit<T, const N: usize>(PhantomData<fn() -> T>);
|
||||||
|
|
||||||
|
impl<T, const N: usize> MakeMaybeUninit<T, N> {
|
||||||
|
pub(crate) const VALUE: MaybeUninit<T> = MaybeUninit::uninit();
|
||||||
|
|
||||||
|
pub(crate) const ARRAY: [MaybeUninit<T>; N] = [Self::VALUE; N];
|
||||||
|
}
|
||||||
|
|
||||||
Reference in New Issue
Block a user