diff options
| author | bors <bors@rust-lang.org> | 2019-10-06 20:24:37 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-10-06 20:24:37 +0000 |
| commit | 09868a56c95f7bc7b6ee3ab7611e3ca551031dbd (patch) | |
| tree | 0feef472e9650b8449e8486256ff68d903d455fb /src/librustc | |
| parent | 421bd77f42c2fe8a2596dbcc1580ec97fb89009f (diff) | |
| parent | dd04a8391817fe3f03ca508f1d7e5567337b013d (diff) | |
| download | rust-09868a56c95f7bc7b6ee3ab7611e3ca551031dbd.tar.gz rust-09868a56c95f7bc7b6ee3ab7611e3ca551031dbd.zip | |
Auto merge of #65169 - tmandry:rollup-qxjj8xp, r=tmandry
Rollup of 5 pull requests Successful merges: - #65095 (Sort error codes in librustc_passes) - #65101 (Upgrade librustc_macros dependencies) - #65142 (Ensure that associated `async fn`s have unique fresh param names) - #65155 (Use shorthand initialization in rustdoc) - #65158 (Remove dead module) Failed merges: r? @ghost
Diffstat (limited to 'src/librustc')
| -rw-r--r-- | src/librustc/hir/lowering.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustc/hir/lowering.rs b/src/librustc/hir/lowering.rs index 2238a56b29d..d773c454432 100644 --- a/src/librustc/hir/lowering.rs +++ b/src/librustc/hir/lowering.rs @@ -844,7 +844,7 @@ impl<'a> LoweringContext<'a> { /// header, we convert it to an in-band lifetime. fn collect_fresh_in_band_lifetime(&mut self, span: Span) -> ParamName { assert!(self.is_collecting_in_band_lifetimes); - let index = self.lifetimes_to_define.len(); + let index = self.lifetimes_to_define.len() + self.in_scope_lifetimes.len(); let hir_name = ParamName::Fresh(index); self.lifetimes_to_define.push((span, hir_name)); hir_name |