Address review comments + Fix rebase

src/librustc_resolve/macros.rs

@@ -19,7 +19,7 @@ use syntax::ext::base::{MacroKind, SyntaxExtension};
 use syntax::ext::expand::{AstFragment, Invocation, InvocationKind};
 use syntax::ext::hygiene::Mark;
 use syntax::ext::tt::macro_rules;
-use syntax::feature_gate::{feature_err, is_builtin_attr_name};
+use syntax::feature_gate::{feature_err, emit_feature_err, is_builtin_attr_name};
 use syntax::feature_gate::{AttributeGate, GateIssue, Stability, BUILTIN_ATTRIBUTES};
 use syntax::symbol::{Symbol, kw, sym};
 use syntax::visit::Visitor;

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,

src/test/ui/feature-gates/feature-gate-custom_test_frameworks.rs

@@ -1,3 +1,6 @@
 #![test_runner(main)] //~ ERROR custom test frameworks are an unstable feature
 
+#[test_case] //~ ERROR custom test frameworks are an unstable feature
+fn f() {}
+
 fn main() {}

src/test/ui/feature-gates/feature-gate-custom_test_frameworks.stderr

@@ -1,3 +1,12 @@
+error[E0658]: use of unstable library feature 'custom_test_frameworks': custom test frameworks are an unstable feature
+  --> $DIR/feature-gate-custom_test_frameworks.rs:3:1
+   |
+LL | #[test_case]
+   | ^^^^^^^^^^^^
+   |
+   = note: for more information, see https://github.com/rust-lang/rust/issues/50297
+   = help: add #![feature(custom_test_frameworks)] to the crate attributes to enable
+
 error[E0658]: custom test frameworks are an unstable feature
   --> $DIR/feature-gate-custom_test_frameworks.rs:1:1
    |
@@ -7,6 +16,6 @@ LL | #![test_runner(main)]
    = note: for more information, see https://github.com/rust-lang/rust/issues/50297
    = help: add #![feature(custom_test_frameworks)] to the crate attributes to enable
 
-error: aborting due to previous error
+error: aborting due to 2 previous errors
 
 For more information about this error, try `rustc --explain E0658`.

src/test/ui/macros/macro-deprecation.rs

@@ -1,4 +1,4 @@
-// compile-pass
+// check-pass
 // aux-build:deprecated-macros.rs
 
 #[macro_use] extern crate deprecated_macros;