Change feature name from 'serde' to 'serde-1'.
This commit is contained in:
+1
-1
@@ -1,7 +1,7 @@
|
||||
language: rust
|
||||
sudo: false
|
||||
env:
|
||||
- FEATURES='serde'
|
||||
- FEATURES='serde-1'
|
||||
matrix:
|
||||
include:
|
||||
- rust: 1.12.0
|
||||
|
||||
@@ -31,3 +31,4 @@ version = "1.0"
|
||||
default = ["std"]
|
||||
std = ["odds/std", "nodrop/std"]
|
||||
use_union = ["nodrop/use_union"]
|
||||
serde-1 = ["serde"]
|
||||
|
||||
+3
-3
@@ -14,7 +14,7 @@ use array::Index;
|
||||
use CapacityError;
|
||||
use odds::char::encode_utf8;
|
||||
|
||||
#[cfg(feature="serde")]
|
||||
#[cfg(feature="serde-1")]
|
||||
use serde::{Serialize, Deserialize, Serializer, Deserializer};
|
||||
|
||||
/// A string with a fixed capacity.
|
||||
@@ -328,7 +328,7 @@ impl<A: Array<Item=u8>> Ord for ArrayString<A> {
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(feature="serde")]
|
||||
#[cfg(feature="serde-1")]
|
||||
impl<A: Array<Item=u8>> Serialize for ArrayString<A> {
|
||||
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
|
||||
where S: Serializer
|
||||
@@ -337,7 +337,7 @@ impl<A: Array<Item=u8>> Serialize for ArrayString<A> {
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(feature="serde")]
|
||||
#[cfg(feature="serde-1")]
|
||||
impl<'de, A: Array<Item=u8>> Deserialize<'de> for ArrayString<A> {
|
||||
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
|
||||
where D: Deserializer<'de>
|
||||
|
||||
+4
-4
@@ -18,7 +18,7 @@
|
||||
#![cfg_attr(not(feature="std"), no_std)]
|
||||
extern crate odds;
|
||||
extern crate nodrop;
|
||||
#[cfg(feature="serde")]
|
||||
#[cfg(feature="serde-1")]
|
||||
extern crate serde;
|
||||
|
||||
#[cfg(not(feature="std"))]
|
||||
@@ -48,7 +48,7 @@ use std::any::Any; // core but unused
|
||||
|
||||
use nodrop::NoDrop;
|
||||
|
||||
#[cfg(feature="serde")]
|
||||
#[cfg(feature="serde-1")]
|
||||
use serde::{Serialize, Deserialize, Serializer, Deserializer};
|
||||
|
||||
mod array;
|
||||
@@ -826,7 +826,7 @@ impl<A: Array<Item=u8>> io::Write for ArrayVec<A> {
|
||||
fn flush(&mut self) -> io::Result<()> { Ok(()) }
|
||||
}
|
||||
|
||||
#[cfg(feature="serde")]
|
||||
#[cfg(feature="serde-1")]
|
||||
impl<T: Serialize, A: Array<Item=T>> Serialize for ArrayVec<A> {
|
||||
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
|
||||
where S: Serializer
|
||||
@@ -835,7 +835,7 @@ impl<T: Serialize, A: Array<Item=T>> Serialize for ArrayVec<A> {
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(feature="serde")]
|
||||
#[cfg(feature="serde-1")]
|
||||
impl<'de, T: Deserialize<'de>, A: Array<Item=T>> Deserialize<'de> for ArrayVec<A> {
|
||||
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
|
||||
where D: Deserializer<'de>
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
#![cfg(feature = "serde")]
|
||||
#![cfg(feature = "serde-1")]
|
||||
extern crate arrayvec;
|
||||
extern crate serde_test;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user