From 4fde4fe0a6aed5d9274ef2b8e6c7b0860dcfa80d Mon Sep 17 00:00:00 2001
From: Nick Alexander <nalexander@mozilla.com>
Date: Fri, 11 May 2018 10:21:58 -0700
Subject: [PATCH] Bustage fixes: compile on stable; avoid unused variable
 warning.

---
 db/src/bootstrap.rs           |  2 +-
 edn/src/namespaceable_name.rs | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/db/src/bootstrap.rs b/db/src/bootstrap.rs
index c35f041c..c299f11a 100644
--- a/db/src/bootstrap.rs
+++ b/db/src/bootstrap.rs
@@ -207,7 +207,7 @@ fn symbolic_schema_to_triples(ident_map: &IdentMap, symbolic_schema: &Value) ->
             for (ident, mp) in m {
                 let ident = match ident {
                     &Value::Keyword(ref ident) => ident,
-                    v => bail!(ErrorKind::BadBootstrapDefinition(format!("Expected namespaced keyword for ident but got '{:?}'", ident))),
+                    _ => bail!(ErrorKind::BadBootstrapDefinition(format!("Expected namespaced keyword for ident but got '{:?}'", ident))),
                 };
                 match *mp {
                     Value::Map(ref mpp) => {
diff --git a/edn/src/namespaceable_name.rs b/edn/src/namespaceable_name.rs
index 562a6b88..2f5ce8a6 100644
--- a/edn/src/namespaceable_name.rs
+++ b/edn/src/namespaceable_name.rs
@@ -17,9 +17,15 @@ use std::cmp::{
 use std::fmt;
 
 #[cfg(feature = "serde_support")]
-use serde::{
-    de::{self, Deserialize, Deserializer},
-    ser::{Serialize, Serializer}
+use serde::de::{
+    self,
+    Deserialize,
+    Deserializer
+};
+#[cfg(feature = "serde_support")]
+use serde::ser::{
+    Serialize,
+    Serializer,
 };
 
 // Data storage for both NamespaceableKeyword and NamespaceableSymbol.