From 9a4ba047c46d7676348f6266fc91907a3253376e Mon Sep 17 00:00:00 2001
From: Erick Tryzelaar <erick.tryzelaar@gmail.com>
Date: Sun, 12 Apr 2015 10:48:32 -0700
Subject: [PATCH] Remove `collections` feature flag and disable VecMap, which
 is unstable

---
 src/de/impls.rs  | 5 ++++-
 src/lib.rs       | 2 +-
 src/ser/impls.rs | 5 ++++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/de/impls.rs b/src/de/impls.rs
index 73ee53ee..53b3c16b 100644
--- a/src/de/impls.rs
+++ b/src/de/impls.rs
@@ -1,4 +1,4 @@
-use std::collections::{BTreeMap, BTreeSet, HashMap, HashSet, VecMap};
+use std::collections::{BTreeMap, BTreeSet, HashMap, HashSet};
 use std::hash::Hash;
 use std::marker::PhantomData;
 use std::num::FromPrimitive;
@@ -572,6 +572,8 @@ impl<K, V> Deserialize for HashMap<K, V>
 
 ///////////////////////////////////////////////////////////////////////////////
 
+// FIXME: `VecMap` is unstable.
+/*
 pub struct VecMapVisitor<V> {
     marker: PhantomData<VecMap<V>>,
 }
@@ -623,6 +625,7 @@ impl<V> Deserialize for VecMap<V>
         deserializer.visit(VecMapVisitor::new())
     }
 }
+*/
 
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/lib.rs b/src/lib.rs
index a1d9d717..5176b556 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -6,7 +6,7 @@
 //! leaving serde to perform roughly the same speed as a hand written serializer for a specific
 //! type.
 
-#![feature(collections, core)]
+#![feature(core)]
 
 
 pub use ser::{Serialize, Serializer};
diff --git a/src/ser/impls.rs b/src/ser/impls.rs
index c71a1bd7..08953727 100644
--- a/src/ser/impls.rs
+++ b/src/ser/impls.rs
@@ -1,4 +1,4 @@
-use std::collections::{BTreeMap, BTreeSet, HashMap, HashSet, VecMap};
+use std::collections::{BTreeMap, BTreeSet, HashMap, HashSet};
 use std::hash::Hash;
 use std::path;
 use std::rc::Rc;
@@ -410,6 +410,8 @@ impl<K, V> Serialize for HashMap<K, V>
     }
 }
 
+// FIXME: `VecMap` is unstable.
+/*
 impl<V> Serialize for VecMap<V>
     where V: Serialize,
 {
@@ -420,6 +422,7 @@ impl<V> Serialize for VecMap<V>
         serializer.visit_map(MapIteratorVisitor::new(self.iter(), Some(self.len())))
     }
 }
+*/
 
 ///////////////////////////////////////////////////////////////////////////////