diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-12-16 17:08:03 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2020-12-16 17:08:03 +0000 |
commit | 067067a6c11bb5afda98f5af14bfdec4744e7812 (patch) | |
tree | 1c0b6c4c78ee040ebdf818dada804fce311382a6 /crates/hir_def/src/item_tree | |
parent | 63bbdb31e5148c804bbf940963c9c8f3481ad258 (diff) | |
parent | dd496223f50232fe98312ee8edc89eb4b5ee3d85 (diff) |
Merge #6896
6896: Node-ify lifetimes r=jonas-schievink a=Veykril
Let's see if this passes the tests 🤞
Depends on https://github.com/rust-analyzer/ungrammar/pull/15
Co-authored-by: Jonas Schievink <[email protected]>
Co-authored-by: Jonas Schievink <[email protected]>
Co-authored-by: Lukas Wirth <[email protected]>
Diffstat (limited to 'crates/hir_def/src/item_tree')
-rw-r--r-- | crates/hir_def/src/item_tree/lower.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/hir_def/src/item_tree/lower.rs b/crates/hir_def/src/item_tree/lower.rs index 1dc06a211..dd3409762 100644 --- a/crates/hir_def/src/item_tree/lower.rs +++ b/crates/hir_def/src/item_tree/lower.rs | |||
@@ -300,12 +300,12 @@ impl Ctx { | |||
300 | ast::SelfParamKind::Owned => self_type, | 300 | ast::SelfParamKind::Owned => self_type, |
301 | ast::SelfParamKind::Ref => TypeRef::Reference( | 301 | ast::SelfParamKind::Ref => TypeRef::Reference( |
302 | Box::new(self_type), | 302 | Box::new(self_type), |
303 | self_param.lifetime_token().map(LifetimeRef::from_token), | 303 | self_param.lifetime().as_ref().map(LifetimeRef::new), |
304 | Mutability::Shared, | 304 | Mutability::Shared, |
305 | ), | 305 | ), |
306 | ast::SelfParamKind::MutRef => TypeRef::Reference( | 306 | ast::SelfParamKind::MutRef => TypeRef::Reference( |
307 | Box::new(self_type), | 307 | Box::new(self_type), |
308 | self_param.lifetime_token().map(LifetimeRef::from_token), | 308 | self_param.lifetime().as_ref().map(LifetimeRef::new), |
309 | Mutability::Mut, | 309 | Mutability::Mut, |
310 | ), | 310 | ), |
311 | } | 311 | } |