From: Mazdak <twingoow@gmail.com>
Date: Fri, 19 Jan 2018 01:41:58 +0000 (+0100)
Subject: fix prelude reexport of convert::id
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=567f040c65808867936f61cfc47d2621a40278bb;p=rust.git

fix prelude reexport of convert::id
---

diff --git a/src/libcore/prelude/v1.rs b/src/libcore/prelude/v1.rs
index 348cfc97b80..6f4f273a31f 100644
--- a/src/libcore/prelude/v1.rs
+++ b/src/libcore/prelude/v1.rs
@@ -29,8 +29,8 @@
 #[doc(no_inline)]
 pub use mem::drop;
 #[unstable(feature = "convert_id_prelude", issue = "0")]
-#[inline]
-#[doc(no_inline)] pub use convert::id;
+#[doc(no_inline)]
+pub use convert::id;
 
 // Re-exported types and traits
 #[stable(feature = "core_prelude", since = "1.4.0")]
diff --git a/src/libstd/prelude/v1.rs b/src/libstd/prelude/v1.rs
index 190304a1d3e..d256353ab30 100644
--- a/src/libstd/prelude/v1.rs
+++ b/src/libstd/prelude/v1.rs
@@ -24,8 +24,8 @@
 #[stable(feature = "rust1", since = "1.0.0")]
 #[doc(no_inline)] pub use mem::drop;
 #[unstable(feature = "convert_id_prelude", issue = "0")]
-#[inline]
-#[doc(no_inline)] pub use convert::id;
+#[doc(no_inline)]
+pub use convert::id;
 
 // Re-exported types and traits
 #[stable(feature = "rust1", since = "1.0.0")]