mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IntoFuture::into_future is no longer unstable

Browse Source
This commit is contained in:
Michael Goulet 2023-04-26 21:06:22 +00:00
parent 8763965a2c
commit c18e7b765f
4 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
compiler/rustc_ast_lowering/src/expr.rs
View File

@ -858,13 +858,8 @@ fn lower_expr_await(&mut self, dot_await_span: Span, expr: &Expr) -> hir::ExprKi
let awaitee_arm = self.arm(awaitee_pat, loop_expr); let awaitee_arm = self.arm(awaitee_pat, loop_expr);
// `match ::std::future::IntoFuture::into_future(<expr>) { ... }` // `match ::std::future::IntoFuture::into_future(<expr>) { ... }`
let into_future_span = self.mark_span_with_reason(
DesugaringKind::Await,
dot_await_span,
self.allow_into_future.clone(),
);
let into_future_expr = self.expr_call_lang_item_fn( let into_future_expr = self.expr_call_lang_item_fn(
into_future_span, span,
hir::LangItem::IntoFutureIntoFuture, hir::LangItem::IntoFutureIntoFuture,
arena_vec![self; expr], arena_vec![self; expr],
Some(expr_hir_id), Some(expr_hir_id),

1
compiler/rustc_ast_lowering/src/item.rs
View File

@ -83,7 +83,6 @@ fn with_lctx(
impl_trait_bounds: Vec::new(), impl_trait_bounds: Vec::new(),
allow_try_trait: Some([sym::try_trait_v2, sym::yeet_desugar_details][..].into()), allow_try_trait: Some([sym::try_trait_v2, sym::yeet_desugar_details][..].into()),
allow_gen_future: Some([sym::gen_future, sym::closure_track_caller][..].into()), allow_gen_future: Some([sym::gen_future, sym::closure_track_caller][..].into()),
allow_into_future: Some([sym::into_future][..].into()),
generics_def_id_map: Default::default(), generics_def_id_map: Default::default(),
}; };
lctx.with_hir_id_owner(owner, |lctx| f(lctx)); lctx.with_hir_id_owner(owner, |lctx| f(lctx));

1
compiler/rustc_ast_lowering/src/lib.rs
View File

@ -136,7 +136,6 @@ struct LoweringContext<'a, 'hir> {
allow_try_trait: Option<Lrc<[Symbol]>>, allow_try_trait: Option<Lrc<[Symbol]>>,
allow_gen_future: Option<Lrc<[Symbol]>>, allow_gen_future: Option<Lrc<[Symbol]>>,
allow_into_future: Option<Lrc<[Symbol]>>,
/// Mapping from generics `def_id`s to TAIT generics `def_id`s. /// Mapping from generics `def_id`s to TAIT generics `def_id`s.
/// For each captured lifetime (e.g., 'a), we create a new lifetime parameter that is a generic /// For each captured lifetime (e.g., 'a), we create a new lifetime parameter that is a generic

2
tests/mir-opt/building/async_await.b-{closure#0}.generator_resume.0.mir
View File

@ -12,7 +12,7 @@
_1: GeneratorSavedTy { _1: GeneratorSavedTy {
ty: impl std::future::Future<Output = ()>, ty: impl std::future::Future<Output = ()>,
source_info: SourceInfo { source_info: SourceInfo {
span: $DIR/async_await.rs:16:8: 16:14 (#11), span: $DIR/async_await.rs:16:8: 16:14 (#10),
scope: scope[0], scope: scope[0],
}, },
ignore_for_traits: false, ignore_for_traits: false,