diff options
| author | bors <bors@rust-lang.org> | 2018-12-28 10:54:16 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-12-28 10:54:16 +0000 |
| commit | 48742c68d9e53fba6b48c211140db595fbaa491e (patch) | |
| tree | 355ba80b28b0c78eaf0bb286d1160c0990fd34d6 /src/libstd | |
| parent | ee49bf8964492ad22f530cbcadcafc6704ec44c3 (diff) | |
| parent | 11f4d3e40ef663e9365fb70f36cf22da3b673de0 (diff) | |
| download | rust-48742c68d9e53fba6b48c211140db595fbaa491e.tar.gz rust-48742c68d9e53fba6b48c211140db595fbaa491e.zip | |
Auto merge of #57137 - cramertj:unpin-prelude, r=SimonSapin
Add Unpin to std prelude, not just core r? @alexcrichton
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/prelude/v1.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/prelude/v1.rs b/src/libstd/prelude/v1.rs index 0c3b164f654..3001c899f62 100644 --- a/src/libstd/prelude/v1.rs +++ b/src/libstd/prelude/v1.rs @@ -9,7 +9,7 @@ // Re-exported core operators #[stable(feature = "rust1", since = "1.0.0")] #[doc(no_inline)] -pub use marker::{Copy, Send, Sized, Sync}; +pub use marker::{Copy, Send, Sized, Sync, Unpin}; #[stable(feature = "rust1", since = "1.0.0")] #[doc(no_inline)] pub use ops::{Drop, Fn, FnMut, FnOnce}; |