about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorMazdak <twingoow@gmail.com>2018-01-19 01:28:25 +0100
committerMazdak <twingoow@gmail.com>2018-01-19 01:28:25 +0100
commit651b25a27c2dc05460a86ba18b57d45d98d83aee (patch)
treeaa43da629fbeb4eaa931cdde80a16576574c02ee /src
parent351fefbb5969f241d195d3dfc1feab463ab678e1 (diff)
downloadrust-651b25a27c2dc05460a86ba18b57d45d98d83aee.tar.gz
rust-651b25a27c2dc05460a86ba18b57d45d98d83aee.zip
add fn core::convert::id<T>(x: T) -> T { x } to the prelude
Diffstat (limited to 'src')
-rw-r--r--src/libcore/prelude/v1.rs3
-rw-r--r--src/libstd/prelude/v1.rs3
2 files changed, 6 insertions, 0 deletions
diff --git a/src/libcore/prelude/v1.rs b/src/libcore/prelude/v1.rs
index d43496c387c..348cfc97b80 100644
--- a/src/libcore/prelude/v1.rs
+++ b/src/libcore/prelude/v1.rs
@@ -28,6 +28,9 @@ pub use ops::{Drop, Fn, FnMut, FnOnce};
 #[stable(feature = "core_prelude", since = "1.4.0")]
 #[doc(no_inline)]
 pub use mem::drop;
+#[unstable(feature = "convert_id_prelude", issue = "0")]
+#[inline]
+#[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 feedd4e1abe..190304a1d3e 100644
--- a/src/libstd/prelude/v1.rs
+++ b/src/libstd/prelude/v1.rs
@@ -23,6 +23,9 @@
 // Re-exported functions
 #[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;
 
 // Re-exported types and traits
 #[stable(feature = "rust1", since = "1.0.0")]