diff options
| author | bors <bors@rust-lang.org> | 2021-08-31 11:20:32 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-08-31 11:20:32 +0000 |
| commit | 76d18cfb8945f824c8777e04981e930d2037954e (patch) | |
| tree | 9f4dba058543f58edd2637684793081670592a2d /compiler/rustc_ast_lowering/src/lib.rs | |
| parent | fe37929e4cba2c5c21e6805805769630c736bc3d (diff) | |
| parent | feafda8cd3f98e5ebb0a2637918180722dec4799 (diff) | |
Auto merge of #88527 - m-ou-se:rollup-az6xtc5, r=m-ou-se
Rollup of 14 pull requests Successful merges: - #88394 (Document `std::env::current_exe` possible rename behaviour) - #88406 (Tait nest infer test) - #88408 (Add inference cycle TAIT test) - #88409 (Add auto trait leakage TAIT test) - #88413 (Add weird return types TAIT test) - #88450 (fix(rustc_parse): correct span in `maybe_whole_expr!`) - #88462 (rustdoc: Stop using resolver for macro loading) - #88465 (Adding examples to docs of `std::time` module) - #88486 (Remove unused arena macro args) - #88492 (Use MaybeUninit::write in functor.rs) - #88496 (Fix prelude collision lint suggestion for generics with lifetimes) - #88497 (Fix prelude collision suggestions for glob imported traits. ) - #88503 (Warn when [T; N].into_iter() is ambiguous in the new edition. ) - #88509 (Don't suggest extra <> in dyn suggestion.) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_ast_lowering/src/lib.rs')
| -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 b71fcb7a349..0133acfee10 100644 --- a/compiler/rustc_ast_lowering/src/lib.rs +++ b/compiler/rustc_ast_lowering/src/lib.rs @@ -84,7 +84,7 @@ mod path; const HIR_ID_COUNTER_LOCKED: u32 = 0xFFFFFFFF; -rustc_hir::arena_types!(rustc_arena::declare_arena, [], 'tcx); +rustc_hir::arena_types!(rustc_arena::declare_arena, 'tcx); struct LoweringContext<'a, 'hir: 'a> { /// Used to assign IDs to HIR nodes that do not directly correspond to AST nodes. |