diff --git a/Cargo.toml b/Cargo.toml index d910d17..7a43ace 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -37,13 +37,12 @@ harness = false [features] default = ["std"] std = [] -serde-1 = ["serde"] array-sizes-33-128 = [] array-sizes-129-255 = [] [package.metadata.docs.rs] -features = ["serde-1"] +features = ["serde"] [package.metadata.release] no-dev-version = true diff --git a/src/array_string.rs b/src/array_string.rs index a7b4d08..66e54c7 100644 --- a/src/array_string.rs +++ b/src/array_string.rs @@ -14,7 +14,7 @@ use crate::array::Index; use crate::CapacityError; use crate::char::encode_utf8; -#[cfg(feature="serde-1")] +#[cfg(feature="serde")] use serde::{Serialize, Deserialize, Serializer, Deserializer}; use super::MaybeUninit as MaybeUninitCopy; @@ -518,8 +518,8 @@ impl FromStr for ArrayString } } -#[cfg(feature="serde-1")] -/// Requires crate feature `"serde-1"` +#[cfg(feature="serde")] +/// Requires crate feature `"serde"` impl Serialize for ArrayString where A: Array + Copy { @@ -530,8 +530,8 @@ impl Serialize for ArrayString } } -#[cfg(feature="serde-1")] -/// Requires crate feature `"serde-1"` +#[cfg(feature="serde")] +/// Requires crate feature `"serde"` impl<'de, A> Deserialize<'de> for ArrayString where A: Array + Copy { diff --git a/src/lib.rs b/src/lib.rs index 1c3c15d..b7b7a54 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -7,9 +7,9 @@ //! - Optional, enabled by default //! - Use libstd; disable to use `no_std` instead. //! -//! - `serde-1` +//! - `serde` //! - Optional -//! - Enable serialization for ArrayVec and ArrayString using serde 1.0 +//! - Enable serialization for ArrayVec and ArrayString using serde 1.x //! - `array-sizes-33-128`, `array-sizes-129-255` //! - Optional //! - Enable more array sizes (see [Array] for more information) @@ -21,7 +21,7 @@ #![doc(html_root_url="https://docs.rs/arrayvec/0.4/")] #![cfg_attr(not(feature="std"), no_std)] -#[cfg(feature="serde-1")] +#[cfg(feature="serde")] extern crate serde; #[cfg(not(feature="std"))] @@ -46,7 +46,7 @@ use std::io; mod maybe_uninit; use crate::maybe_uninit::MaybeUninit; -#[cfg(feature="serde-1")] +#[cfg(feature="serde")] use serde::{Serialize, Deserialize, Serializer, Deserializer}; mod array; @@ -1104,8 +1104,8 @@ impl> io::Write for ArrayVec { fn flush(&mut self) -> io::Result<()> { Ok(()) } } -#[cfg(feature="serde-1")] -/// Requires crate feature `"serde-1"` +#[cfg(feature="serde")] +/// Requires crate feature `"serde"` impl> Serialize for ArrayVec { fn serialize(&self, serializer: S) -> Result where S: Serializer @@ -1114,8 +1114,8 @@ impl> Serialize for ArrayVec { } } -#[cfg(feature="serde-1")] -/// Requires crate feature `"serde-1"` +#[cfg(feature="serde")] +/// Requires crate feature `"serde"` impl<'de, T: Deserialize<'de>, A: Array> Deserialize<'de> for ArrayVec { fn deserialize(deserializer: D) -> Result where D: Deserializer<'de>