about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorMazdak Farrokhzad <twingoow@gmail.com>2019-01-18 18:06:37 +0100
committerGitHub <noreply@github.com>2019-01-18 18:06:37 +0100
commitb0563fdb443fa0eefeb9e2a27f351e7e485df058 (patch)
tree40ee86cfb2273177f8099e4040012f1f07264fb0 /src/libstd
parentb12397fad1f555451851344dc7a4d2f82c5df250 (diff)
parente4e888534eae603dfd0d9f9e75e8bb21d5e35f06 (diff)
downloadrust-b0563fdb443fa0eefeb9e2a27f351e7e485df058.tar.gz
rust-b0563fdb443fa0eefeb9e2a27f351e7e485df058.zip
Rollup merge of #57683 - xfix:patch-15, r=QuietMisdreavus
Document Unpin in std::prelude documentation
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/prelude/mod.rs5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/libstd/prelude/mod.rs b/src/libstd/prelude/mod.rs
index ec8318f3728..bf689bad559 100644
--- a/src/libstd/prelude/mod.rs
+++ b/src/libstd/prelude/mod.rs
@@ -44,8 +44,8 @@
 //! The current version of the prelude (version 1) lives in
 //! [`std::prelude::v1`], and re-exports the following.
 //!
-//! * [`std::marker`]::{[`Copy`], [`Send`], [`Sized`], [`Sync`]}. The marker
-//!   traits indicate fundamental properties of types.
+//! * [`std::marker`]::{[`Copy`], [`Send`], [`Sized`], [`Sync`], [`Unpin`]}. The
+//!   marker traits indicate fundamental properties of types.
 //! * [`std::ops`]::{[`Drop`], [`Fn`], [`FnMut`], [`FnOnce`]}. Various
 //!   operations for both destructors and overloading `()`.
 //! * [`std::mem`]::[`drop`][`mem::drop`], a convenience function for explicitly
@@ -108,6 +108,7 @@
 //! [`Sync`]: ../marker/trait.Sync.html
 //! [`ToOwned`]: ../borrow/trait.ToOwned.html
 //! [`ToString`]: ../string/trait.ToString.html
+//! [`Unpin`]: ../marker/trait.Unpin.html
 //! [`Vec`]: ../vec/struct.Vec.html
 //! [`Clone::clone`]: ../clone/trait.Clone.html#tymethod.clone
 //! [`mem::drop`]: ../mem/fn.drop.html