diff options
| author | bors <bors@rust-lang.org> | 2021-06-15 20:15:23 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-06-15 20:15:23 +0000 |
| commit | 607d6b00d4e0e0475b8de9d0c870b7126fdcdf6b (patch) | |
| tree | e32f610c6985de82f3f7076e4239c9b2f55e353d /compiler/rustc_ast_lowering/src | |
| parent | 246571a846e29691bd535d531365acd318857207 (diff) | |
| parent | 74cc63a7a5ded7c4c0e12cd5e4dc4838be914b78 (diff) | |
| download | rust-607d6b00d4e0e0475b8de9d0c870b7126fdcdf6b.tar.gz rust-607d6b00d4e0e0475b8de9d0c870b7126fdcdf6b.zip | |
Auto merge of #86321 - JohnTitor:rollup-q61c8q4, r=JohnTitor
Rollup of 10 pull requests
Successful merges:
- #80269 (Explain non-dropped sender recv in docs)
- #82179 (Add functions `Duration::try_from_secs_{f32, f64}`)
- #85608 (Stabilize `ops::ControlFlow` (just the type))
- #85792 (Refactor windows sockets impl methods)
- #86220 (Improve maybe_uninit_extra docs)
- #86277 (Remove must_use from ALLOWED_ATTRIBUTES)
- #86285 (:arrow_up: rust-analyzer)
- #86294 (Stabilize {std, core}::prelude::rust_*.)
- #86306 (Add mailmap entries for myself)
- #86314 (Remove trailing triple backticks in `mut_keyword` docs)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_ast_lowering/src')
| -rw-r--r-- | compiler/rustc_ast_lowering/src/lib.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_ast_lowering/src/lib.rs b/compiler/rustc_ast_lowering/src/lib.rs index dbab7e15484..9592c1d2fab 100644 --- a/compiler/rustc_ast_lowering/src/lib.rs +++ b/compiler/rustc_ast_lowering/src/lib.rs @@ -331,7 +331,7 @@ pub fn lower_crate<'a, 'hir>( lifetimes_to_define: Vec::new(), is_collecting_in_band_lifetimes: false, in_scope_lifetimes: Vec::new(), - allow_try_trait: Some([sym::control_flow_enum, sym::try_trait_v2][..].into()), + allow_try_trait: Some([sym::try_trait_v2][..].into()), allow_gen_future: Some([sym::gen_future][..].into()), } .lower_crate(krate) |