diff options
| author | bors <bors@rust-lang.org> | 2020-02-13 04:57:41 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-02-13 04:57:41 +0000 |
| commit | 2e6eaceedeeda764056eb0e2134735793533770d (patch) | |
| tree | 216828e2f51b7a84753ef693b97e09577d12c2bc /src/libcore | |
| parent | ba18875557aabffe386a2534a1aa6118efb6ab88 (diff) | |
| parent | 1ddf2504fdeb26bce320c8198c2e594b22efd71a (diff) | |
| download | rust-2e6eaceedeeda764056eb0e2134735793533770d.tar.gz rust-2e6eaceedeeda764056eb0e2134735793533770d.zip | |
Auto merge of #69118 - Dylan-DPC:rollup-7hpm1fj, r=Dylan-DPC
Rollup of 9 pull requests
Successful merges:
- #67642 (Relax bounds on HashMap/HashSet)
- #68848 (Hasten macro parsing)
- #69008 (Properly use parent generics for opaque types)
- #69048 (Suggestion when encountering assoc types from hrtb)
- #69049 (Optimize image sizes)
- #69050 (Micro-optimize the heck out of LEB128 reading and writing.)
- #69068 (Make the SGX arg cleanup implementation a NOP)
- #69082 (When expecting `BoxFuture` and using `async {}`, suggest `Box::pin`)
- #69104 (bootstrap: Configure cmake when building sanitizer runtimes)
Failed merges:
r? @ghost
Diffstat (limited to 'src/libcore')
| -rw-r--r-- | src/libcore/marker.rs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/libcore/marker.rs b/src/libcore/marker.rs index b4b595f330e..2800f11cc01 100644 --- a/src/libcore/marker.rs +++ b/src/libcore/marker.rs @@ -727,6 +727,10 @@ unsafe impl<T: ?Sized> Freeze for &mut T {} /// [`Pin<P>`]: ../pin/struct.Pin.html /// [`pin module`]: ../../std/pin/index.html #[stable(feature = "pin", since = "1.33.0")] +#[rustc_on_unimplemented( + on(_Self = "std::future::Future", note = "consider using `Box::pin`",), + message = "`{Self}` cannot be unpinned" +)] #[lang = "unpin"] pub auto trait Unpin {} |
