diff options
| author | bors <bors@rust-lang.org> | 2022-09-19 14:06:23 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-09-19 14:06:23 +0000 |
| commit | a55dd71d5fb0ec5a6a3a9e8c27b2127ba491ce52 (patch) | |
| tree | 2de5a3c571f7f5b54f4922b644f72f33786eb0e0 /compiler | |
| parent | b31188e88b245f48b364c6cb186b821bd472bd8a (diff) | |
| parent | 7358a9b03e5d22ea4d74d89cb00d3985fc89c773 (diff) | |
| download | rust-1.64.0.tar.gz rust-1.64.0.zip | |
Auto merge of #102018 - pietroalbini:pa-1.64.0, r=pietroalbini 1.64.0
[stable] Prepare 1.64.0 release This PR prepares the 1.64.0 stable release builds. In addition to bumping the channel and including the latest release notes changes, this PR also backports the following PRs: * #100852 * #101366 * #101468 * #101922 This PR also reverts the following PRs, as decided in https://github.com/rust-lang/rust/issues/101899#issuecomment-1250996783: * https://github.com/rust-lang/rust/pull/95295 * https://github.com/rust-lang/rust/pull/99136 (followup to the previous PR) r? `@ghost` cc `@rust-lang/release`
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/rustc_ast_lowering/src/lib.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/compiler/rustc_ast_lowering/src/lib.rs b/compiler/rustc_ast_lowering/src/lib.rs index f387743c915..224dc3c23d4 100644 --- a/compiler/rustc_ast_lowering/src/lib.rs +++ b/compiler/rustc_ast_lowering/src/lib.rs @@ -1577,8 +1577,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> { LifetimeRes::Fresh { param, binder: _ } => { debug_assert_eq!(lifetime.ident.name, kw::UnderscoreLifetime); - let old_def_id = self.local_def_id(param); - if remapping.get(&old_def_id).is_none() { + if let Some(old_def_id) = self.opt_local_def_id(param) && remapping.get(&old_def_id).is_none() { let node_id = self.next_node_id(); let new_def_id = self.create_def( |