diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-12-12 14:35:38 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-12-12 14:35:38 +0000 |
| commit | 479d1f7eec22c3564867223e2093f14774092528 (patch) | |
| tree | 0b7b74f69d33ca5c86267ace1ac38c2c15248e50 /crates/assists/src | |
| parent | 64a1c9810d5979cfd0fe6e7c385d9ca3caac2163 (diff) | |
| parent | 11f86641829273e2b2b7023c2028bb475fce58ee (diff) | |
Merge #6818
6818: Add Lifetimes to the HIR r=matklad a=Veykril
This doesn't handle resolve yet as I don't know yet how that will be used. I'll get to that once I start moving the lifetime reference PR to the hir.
This also adds a new `hir` name type for lifetimes and labels, `hir::LifetimeName`.
Co-authored-by: Lukas Wirth <[email protected]>
Diffstat (limited to 'crates/assists/src')
| -rw-r--r-- | crates/assists/src/ast_transform.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/assists/src/ast_transform.rs b/crates/assists/src/ast_transform.rs index 66e4634b1..da94e9987 100644 --- a/crates/assists/src/ast_transform.rs +++ b/crates/assists/src/ast_transform.rs | |||
| @@ -89,7 +89,7 @@ impl<'a> SubstituteTypeParams<'a> { | |||
| 89 | let substs = get_syntactic_substs(impl_def).unwrap_or_default(); | 89 | let substs = get_syntactic_substs(impl_def).unwrap_or_default(); |
| 90 | let generic_def: hir::GenericDef = trait_.into(); | 90 | let generic_def: hir::GenericDef = trait_.into(); |
| 91 | let substs_by_param: FxHashMap<_, _> = generic_def | 91 | let substs_by_param: FxHashMap<_, _> = generic_def |
| 92 | .params(source_scope.db) | 92 | .type_params(source_scope.db) |
| 93 | .into_iter() | 93 | .into_iter() |
| 94 | // this is a trait impl, so we need to skip the first type parameter -- this is a bit hacky | 94 | // this is a trait impl, so we need to skip the first type parameter -- this is a bit hacky |
| 95 | .skip(1) | 95 | .skip(1) |