diff options
| author | Jonas Schievink <jonasschievink@gmail.com> | 2020-02-10 18:20:22 +0100 |
|---|---|---|
| committer | Jonas Schievink <jonasschievink@gmail.com> | 2020-03-17 22:17:31 +0100 |
| commit | b7fba973cb4b6547f24d89b901f7ac294c269503 (patch) | |
| tree | 1e32e20c0c375ba27e67a030228e93ab2aa1babb | |
| parent | f79a95a65dea5901cb020b41997fb4d4ca806b18 (diff) | |
| download | rust-b7fba973cb4b6547f24d89b901f7ac294c269503.tar.gz rust-b7fba973cb4b6547f24d89b901f7ac294c269503.zip | |
Format
| -rw-r--r-- | src/libcore/future/mod.rs | 2 | ||||
| -rw-r--r-- | src/librustc_ast_lowering/expr.rs | 10 |
2 files changed, 4 insertions, 8 deletions
diff --git a/src/libcore/future/mod.rs b/src/libcore/future/mod.rs index 6150f34d844..9dcb2cea2ea 100644 --- a/src/libcore/future/mod.rs +++ b/src/libcore/future/mod.rs @@ -47,7 +47,7 @@ unsafe impl Sync for ResumeTy {} #[inline] pub const fn from_generator<T>(gen: T) -> impl Future<Output = T::Return> where - T: Generator<ResumeTy, Yield = ()> + T: Generator<ResumeTy, Yield = ()>, { #[derive(Copy, Clone, Debug, Eq, PartialEq, Ord, PartialOrd, Hash)] struct GenFuture<T: Generator<ResumeTy, Yield = ()>>(T); diff --git a/src/librustc_ast_lowering/expr.rs b/src/librustc_ast_lowering/expr.rs index 104634f4fa0..868b31d668c 100644 --- a/src/librustc_ast_lowering/expr.rs +++ b/src/librustc_ast_lowering/expr.rs @@ -675,11 +675,8 @@ impl<'hir> LoweringContext<'_, 'hir> { if let Some(task_context_hid) = self.task_context { let lhs = self.expr_ident(span, task_context_ident, task_context_hid); - let assign = self.expr( - span, - hir::ExprKind::Assign(lhs, yield_expr, span), - AttrVec::new(), - ); + let assign = + self.expr(span, hir::ExprKind::Assign(lhs, yield_expr, span), AttrVec::new()); self.stmt_expr(span, assign) } else { // Use of `await` outside of an async context. Return `yield_expr` so that we can @@ -688,8 +685,7 @@ impl<'hir> LoweringContext<'_, 'hir> { } }; - let loop_block = - self.block_all(span, arena_vec![self; inner_match_stmt, yield_stmt], None); + let loop_block = self.block_all(span, arena_vec![self; inner_match_stmt, yield_stmt], None); // loop { ...; task_context = yield (); } let loop_expr = self.arena.alloc(hir::Expr { |
