Quaternions/arrayvec
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change feature name from 'serde' to 'serde-1'.

Browse Source
This commit is contained in:
David Ross
2017-06-08 11:59:09 -07:00
parent 21cd20ff26
commit 1b0168bb6f
5 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
+1 -1
View File
@@ -1,7 +1,7 @@
language: rust language: rust
sudo: false sudo: false
env: env:
- FEATURES='serde' - FEATURES='serde-1'
matrix: matrix:
include: include:
- rust: 1.12.0 - rust: 1.12.0
Cargo.toml
+1
View File
@@ -31,3 +31,4 @@ version = "1.0"
default = ["std"] default = ["std"]
std = ["odds/std", "nodrop/std"] std = ["odds/std", "nodrop/std"]
use_union = ["nodrop/use_union"] use_union = ["nodrop/use_union"]
serde-1 = ["serde"]
src/array_string.rs
+3 -3
View File
@@ -14,7 +14,7 @@ use array::Index;
use CapacityError; use CapacityError;
use odds::char::encode_utf8; use odds::char::encode_utf8;
#[cfg(feature="serde")] #[cfg(feature="serde-1")]
use serde::{Serialize, Deserialize, Serializer, Deserializer}; use serde::{Serialize, Deserialize, Serializer, Deserializer};
/// A string with a fixed capacity. /// 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> { impl<A: Array<Item=u8>> Serialize for ArrayString<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
@@ -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> { impl<'de, A: Array<Item=u8>> Deserialize<'de> for ArrayString<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>
src/lib.rs
+4 -4
View File
@@ -18,7 +18,7 @@
#![cfg_attr(not(feature="std"), no_std)] #![cfg_attr(not(feature="std"), no_std)]
extern crate odds; extern crate odds;
extern crate nodrop; extern crate nodrop;
#[cfg(feature="serde")] #[cfg(feature="serde-1")]
extern crate serde; extern crate serde;
#[cfg(not(feature="std"))] #[cfg(not(feature="std"))]
@@ -48,7 +48,7 @@ use std::any::Any; // core but unused
use nodrop::NoDrop; use nodrop::NoDrop;
#[cfg(feature="serde")] #[cfg(feature="serde-1")]
use serde::{Serialize, Deserialize, Serializer, Deserializer}; use serde::{Serialize, Deserialize, Serializer, Deserializer};
mod array; mod array;
@@ -826,7 +826,7 @@ 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")] #[cfg(feature="serde-1")]
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
@@ -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> { 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>
tests/serde.rs
+1 -1
View File
@@ -1,4 +1,4 @@
#![cfg(feature = "serde")] #![cfg(feature = "serde-1")]
extern crate arrayvec; extern crate arrayvec;
extern crate serde_test; extern crate serde_test;