Skip to content

Commit 1f08f66

Browse files
committed
Auto merge of #107064 - GuillaumeGomez:rollup-pbgu6r3, r=GuillaumeGomez
Rollup of 5 pull requests Successful merges: - #105977 (Transform async `ResumeTy` in generator transform) - #106927 (make `CastError::NeedsDeref` create a `MachineApplicable` suggestion) - #106931 (document + UI test `E0208` and make its output more user-friendly) - #107027 (Remove extra removal from test path) - #107037 (Fix Dominators::rank_partial_cmp to match documentation) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents 7510777 + 7bda637 commit 1f08f66

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

core/src/future/mod.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,10 @@ pub unsafe fn get_context<'a, 'b>(cx: ResumeTy) -> &'a mut Context<'b> {
112112
unsafe { &mut *cx.0.as_ptr().cast() }
113113
}
114114

115+
// FIXME(swatinem): This fn is currently needed to work around shortcomings
116+
// in type and lifetime inference.
117+
// See the comment at the bottom of `LoweringContext::make_async_expr` and
118+
// <https://github.com/rust-lang/rust/issues/104826>.
115119
#[doc(hidden)]
116120
#[unstable(feature = "gen_future", issue = "50547")]
117121
#[inline]

core/src/task/wake.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,7 @@ impl RawWakerVTable {
174174
/// Currently, `Context` only serves to provide access to a [`&Waker`](Waker)
175175
/// which can be used to wake the current task.
176176
#[stable(feature = "futures_api", since = "1.36.0")]
177+
#[cfg_attr(not(bootstrap), lang = "Context")]
177178
pub struct Context<'a> {
178179
waker: &'a Waker,
179180
// Ensure we future-proof against variance changes by forcing

0 commit comments

Comments
 (0)