From 1b0168bb6fce3415def290eebb24df62e32594bb Mon Sep 17 00:00:00 2001
From: David Ross <daboross@daboross.net>
Date: Thu, 8 Jun 2017 11:59:09 -0700
Subject: [PATCH] Change feature name from 'serde' to 'serde-1'.

---
 .travis.yml         | 2 +-
 Cargo.toml          | 1 +
 src/array_string.rs | 6 +++---
 src/lib.rs          | 8 ++++----
 tests/serde.rs      | 2 +-
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d697ee5..d94772c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 language: rust
 sudo: false
 env:
-  - FEATURES='serde'
+  - FEATURES='serde-1'
 matrix:
   include:
     - rust: 1.12.0
diff --git a/Cargo.toml b/Cargo.toml
index 8a63fdf..4e48bbc 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -31,3 +31,4 @@ version = "1.0"
 default = ["std"]
 std = ["odds/std", "nodrop/std"]
 use_union = ["nodrop/use_union"]
+serde-1 = ["serde"]
diff --git a/src/array_string.rs b/src/array_string.rs
index 6daf71d..b506e6a 100644
--- a/src/array_string.rs
+++ b/src/array_string.rs
@@ -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>
diff --git a/src/lib.rs b/src/lib.rs
index 75cbc0d..1e921e1 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -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>
diff --git a/tests/serde.rs b/tests/serde.rs
index 4bfb83d..1660d69 100644
--- a/tests/serde.rs
+++ b/tests/serde.rs
@@ -1,4 +1,4 @@
-#![cfg(feature = "serde")]
+#![cfg(feature = "serde-1")]
 extern crate arrayvec;
 extern crate serde_test;