rollup merge of #20708: aturon/new-int-modules

Conflicts:
	src/libserialize/lib.rs

2 files changed, 2 insertions, 9 deletions

diff --git a/src/libserialize/json.rs b/src/libserialize/json.rs
index 9e87c90d2e5..4b631d7ef9e 100644
--- a/src/libserialize/json.rs
+++ b/src/libserialize/json.rs
@@ -2458,14 +2458,6 @@ impl<'a> fmt::String for PrettyJson<'a> {
     }
 }
 
-#[cfg(stage0)]
-//NOTE(stage0): remove impl after snapshot
-impl<'a, T: Encodable> fmt::Show for AsJson<'a, T> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        fmt::String::fmt(self, f)
-    }
-}
-
 impl<'a, T: Encodable> fmt::String for AsJson<'a, T> {
     /// Encodes a json value into a string
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
diff --git a/src/libserialize/lib.rs b/src/libserialize/lib.rs
index d1e7f6967bf..d51f070632f 100644
--- a/src/libserialize/lib.rs
+++ b/src/libserialize/lib.rs
@@ -24,8 +24,9 @@ Core encoding and decoding interfaces.
        html_root_url = "http://doc.rust-lang.org/nightly/",
        html_playground_url = "http://play.rust-lang.org/")]
 #![allow(unknown_features)]
-#![feature(slicing_syntax)]
 #![cfg_attr(stage0, allow(unused_attributes))]
+#![feature(old_impl_check)]
+#![feature(slicing_syntax)]
 
 // test harness access
 #[cfg(test)] extern crate test;