From 8f8fc6f3fff1040b4cfa58a0d0f7565b3aaa8c1a Mon Sep 17 00:00:00 2001
From: Oliver 'ker' Schneider <rust19446194516@oli-obk.de>
Date: Thu, 23 Jul 2015 18:37:26 +0200
Subject: [PATCH] nits and rebase fallout

---
 serde_json/src/lib.rs   | 6 +++---
 serde_json/src/value.rs | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/serde_json/src/lib.rs b/serde_json/src/lib.rs
index 2e13f2a4..3032db9c 100644
--- a/serde_json/src/lib.rs
+++ b/serde_json/src/lib.rs
@@ -61,12 +61,12 @@
 //! //#![feature(custom_derive, plugin)]
 //! //#![plugin(serde_macros)]
 //!
-//! extern crate serde;
+//! extern crate serde_json;
 //!
-//! use serde_json::{self, Value};
+//! use serde_json::Value;
 //!
 //! fn main() {
-//!     let data: Value = json::from_str("{\"foo\": 13, \"bar\": \"baz\"}").unwrap();
+//!     let data: Value = serde_json::from_str("{\"foo\": 13, \"bar\": \"baz\"}").unwrap();
 //!     println!("data: {:?}", data);
 //!     // data: {"bar":"baz","foo":13}
 //!     println!("object? {}", data.is_object());
diff --git a/serde_json/src/value.rs b/serde_json/src/value.rs
index f1623af2..f01dfe1d 100644
--- a/serde_json/src/value.rs
+++ b/serde_json/src/value.rs
@@ -767,7 +767,7 @@ impl<'a> de::VariantVisitor for VariantDeserializer<'a> {
         }
     }
 
-    fn visit_map<V>(&mut self, visitor: V) -> Result<V::Value, Error>
+    fn visit_map<V>(&mut self, _fields: &'static[&'static str], visitor: V) -> Result<V::Value, Error>
         where V: de::Visitor,
     {
         if let Value::Object(fields) = self.val.take().unwrap() {