Address review comments + Fix rebase

1 files changed, 7 insertions, 9 deletions

diff --git a/src/libserialize/json.rs b/src/libserialize/json.rs
index 77947a4be7f..d0007074a82 100644
--- a/src/libserialize/json.rs
+++ b/src/libserialize/json.rs
@@ -103,9 +103,8 @@
 //!
 //! ```rust
 //! # #![feature(rustc_private)]
-//! # #![allow(deprecated)]
-//! extern crate serialize;
-//! use serialize::json::{self, ToJson, Json};
+//! extern crate serialize as rustc_serialize;
+//! use rustc_serialize::json::{self, ToJson, Json};
 //!
 //! // A custom data structure
 //! struct ComplexNum {
@@ -121,7 +120,7 @@
 //! }
 //!
 //! // Only generate `RustcEncodable` trait implementation
-//! #[derive(Encodable)]
+//! #[derive(RustcEncodable)]
 //! pub struct ComplexNumRecord {
 //!     uid: u8,
 //!     dsc: String,
@@ -144,13 +143,12 @@
 //!
 //! ```rust
 //! # #![feature(rustc_private)]
-//! # #![allow(deprecated)]
-//! extern crate serialize;
+//! extern crate serialize as rustc_serialize;
 //! use std::collections::BTreeMap;
-//! use serialize::json::{self, Json, ToJson};
+//! use rustc_serialize::json::{self, Json, ToJson};
 //!
-//! // Only generate `Decodable` trait implementation
-//! #[derive(Decodable)]
+//! // Only generate `RustcDecodable` trait implementation
+//! #[derive(RustcDecodable)]
 //! pub struct TestStruct {
 //!     data_int: u8,
 //!     data_str: String,