API: Rename feature flag serde-1 to serde

(Old concerns don't matter anymore, especially with renamed deps.)
This commit is contained in:
bluss
2019-09-25 14:34:08 +02:00
parent 8c3dfbc2b8
commit cac792e633
3 changed files with 14 additions and 15 deletions
+1 -2
View File
@@ -37,13 +37,12 @@ harness = false
[features] [features]
default = ["std"] default = ["std"]
std = [] std = []
serde-1 = ["serde"]
array-sizes-33-128 = [] array-sizes-33-128 = []
array-sizes-129-255 = [] array-sizes-129-255 = []
[package.metadata.docs.rs] [package.metadata.docs.rs]
features = ["serde-1"] features = ["serde"]
[package.metadata.release] [package.metadata.release]
no-dev-version = true no-dev-version = true
+5 -5
View File
@@ -14,7 +14,7 @@ use crate::array::Index;
use crate::CapacityError; use crate::CapacityError;
use crate::char::encode_utf8; use crate::char::encode_utf8;
#[cfg(feature="serde-1")] #[cfg(feature="serde")]
use serde::{Serialize, Deserialize, Serializer, Deserializer}; use serde::{Serialize, Deserialize, Serializer, Deserializer};
use super::MaybeUninit as MaybeUninitCopy; use super::MaybeUninit as MaybeUninitCopy;
@@ -518,8 +518,8 @@ impl<A> FromStr for ArrayString<A>
} }
} }
#[cfg(feature="serde-1")] #[cfg(feature="serde")]
/// Requires crate feature `"serde-1"` /// Requires crate feature `"serde"`
impl<A> Serialize for ArrayString<A> impl<A> Serialize for ArrayString<A>
where A: Array<Item=u8> + Copy where A: Array<Item=u8> + Copy
{ {
@@ -530,8 +530,8 @@ impl<A> Serialize for ArrayString<A>
} }
} }
#[cfg(feature="serde-1")] #[cfg(feature="serde")]
/// Requires crate feature `"serde-1"` /// Requires crate feature `"serde"`
impl<'de, A> Deserialize<'de> for ArrayString<A> impl<'de, A> Deserialize<'de> for ArrayString<A>
where A: Array<Item=u8> + Copy where A: Array<Item=u8> + Copy
{ {
+8 -8
View File
@@ -7,9 +7,9 @@
//! - Optional, enabled by default //! - Optional, enabled by default
//! - Use libstd; disable to use `no_std` instead. //! - Use libstd; disable to use `no_std` instead.
//! //!
//! - `serde-1` //! - `serde`
//! - Optional //! - 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` //! - `array-sizes-33-128`, `array-sizes-129-255`
//! - Optional //! - Optional
//! - Enable more array sizes (see [Array] for more information) //! - Enable more array sizes (see [Array] for more information)
@@ -21,7 +21,7 @@
#![doc(html_root_url="https://docs.rs/arrayvec/0.4/")] #![doc(html_root_url="https://docs.rs/arrayvec/0.4/")]
#![cfg_attr(not(feature="std"), no_std)] #![cfg_attr(not(feature="std"), no_std)]
#[cfg(feature="serde-1")] #[cfg(feature="serde")]
extern crate serde; extern crate serde;
#[cfg(not(feature="std"))] #[cfg(not(feature="std"))]
@@ -46,7 +46,7 @@ use std::io;
mod maybe_uninit; mod maybe_uninit;
use crate::maybe_uninit::MaybeUninit; use crate::maybe_uninit::MaybeUninit;
#[cfg(feature="serde-1")] #[cfg(feature="serde")]
use serde::{Serialize, Deserialize, Serializer, Deserializer}; use serde::{Serialize, Deserialize, Serializer, Deserializer};
mod array; mod array;
@@ -1104,8 +1104,8 @@ impl<A: Array<Item=u8>> io::Write for ArrayVec<A> {
fn flush(&mut self) -> io::Result<()> { Ok(()) } fn flush(&mut self) -> io::Result<()> { Ok(()) }
} }
#[cfg(feature="serde-1")] #[cfg(feature="serde")]
/// Requires crate feature `"serde-1"` /// Requires crate feature `"serde"`
impl<T: Serialize, A: Array<Item=T>> Serialize for ArrayVec<A> { impl<T: Serialize, A: Array<Item=T>> Serialize for ArrayVec<A> {
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
where S: Serializer where S: Serializer
@@ -1114,8 +1114,8 @@ impl<T: Serialize, A: Array<Item=T>> Serialize for ArrayVec<A> {
} }
} }
#[cfg(feature="serde-1")] #[cfg(feature="serde")]
/// Requires crate feature `"serde-1"` /// Requires crate feature `"serde"`
impl<'de, T: Deserialize<'de>, A: Array<Item=T>> Deserialize<'de> for ArrayVec<A> { impl<'de, T: Deserialize<'de>, A: Array<Item=T>> Deserialize<'de> for ArrayVec<A> {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
where D: Deserializer<'de> where D: Deserializer<'de>