diff options
| author | bors <bors@rust-lang.org> | 2019-12-11 19:39:06 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-12-11 19:39:06 +0000 |
| commit | 27d6f55f47e8875e71083a28ed84ea5a88e1b596 (patch) | |
| tree | 2f0866ff8e08df5d73b14362a3a4c0d9991dbfd5 /src/libstd | |
| parent | 90b957a17c1abba979aa41234ce0993a61030e67 (diff) | |
| parent | 5cd9f22464a3ae2620c384094986d9549eca182e (diff) | |
| download | rust-27d6f55f47e8875e71083a28ed84ea5a88e1b596.tar.gz rust-27d6f55f47e8875e71083a28ed84ea5a88e1b596.zip | |
Auto merge of #65345 - davidtwco:issue-64130-async-send-sync-error-improvements, r=nikomatsakis
async/await: improve not-send errors, part 2 Part of #64130. Fixes #65667. This PR improves the errors introduced in #64895 so that they have specialized messages for `Send` and `Sync`. r? @nikomatsakis
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/future.rs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/libstd/future.rs b/src/libstd/future.rs index 6de3f1d545b..ac1ef3e1d8b 100644 --- a/src/libstd/future.rs +++ b/src/libstd/future.rs @@ -26,7 +26,6 @@ pub fn from_generator<T: Generator<Yield = ()>>(x: T) -> impl Future<Output = T: #[doc(hidden)] #[unstable(feature = "gen_future", issue = "50547")] #[derive(Copy, Clone, Debug, Eq, PartialEq, Ord, PartialOrd, Hash)] -#[cfg_attr(not(test), rustc_diagnostic_item = "gen_future")] struct GenFuture<T: Generator<Yield = ()>>(T); // We rely on the fact that async/await futures are immovable in order to create |