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

There's no need to check binders_to_ignore using the old code anymore

Browse Source
This commit is contained in:
Santiago Pastorino 2022-07-26 15:11:44 -03:00
parent 19dcbd151b
commit 5a184acfc6
No known key found for this signature in database
GPG Key ID: 8131A24E0C79EFAF
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1471,11 +1471,10 @@ fn create_and_capture_lifetime_defs(
if let Some(mut captured_lifetimes) = self.captured_lifetimes.take() { if let Some(mut captured_lifetimes) = self.captured_lifetimes.take() {
match res { match res {
LifetimeRes::Param { param, binder } => { LifetimeRes::Param { param, binder } => {
if !captured_lifetimes.binders_to_ignore.contains(&binder) if !binders_to_ignore
&& !binders_to_ignore .get(&lifetime.id)
.get(&lifetime.id) .unwrap_or(&Vec::new())
.unwrap_or(&Vec::new()) .contains(&binder)
.contains(&binder)
{ {
match captured_lifetimes.captures.entry(param) { match captured_lifetimes.captures.entry(param) {
Entry::Occupied(_) => {} Entry::Occupied(_) => {}
@ -1497,11 +1496,10 @@ fn create_and_capture_lifetime_defs(
LifetimeRes::Fresh { param, binder } => { LifetimeRes::Fresh { param, binder } => {
debug_assert_eq!(ident.name, kw::UnderscoreLifetime); debug_assert_eq!(ident.name, kw::UnderscoreLifetime);
if !captured_lifetimes.binders_to_ignore.contains(&binder) if !binders_to_ignore
&& !binders_to_ignore .get(&lifetime.id)
.get(&lifetime.id) .unwrap_or(&Vec::new())
.unwrap_or(&Vec::new()) .contains(&binder)
.contains(&binder)
{ {
let param = self.local_def_id(param); let param = self.local_def_id(param);
match captured_lifetimes.captures.entry(param) { match captured_lifetimes.captures.entry(param) {