diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-11-20 18:38:00 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2019-11-20 18:38:00 +0000 |
commit | 6983afdea9f41e58d7ebbd15012532cd3935451f (patch) | |
tree | 7f902137075f6b44266f127442ae8e99fceaac35 /crates/ra_hir_def/src | |
parent | 5aec3e4a7b21855fb4688e466d4f5bee9feabe2e (diff) | |
parent | 7c275a7ed2253fc7bd8b46c685a754c4d4e9dee3 (diff) |
Merge #2330
2330: Remove hir/adt.rs r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_hir_def/src')
-rw-r--r-- | crates/ra_hir_def/src/generics.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/crates/ra_hir_def/src/generics.rs b/crates/ra_hir_def/src/generics.rs index f794eefbc..9e2e4c3cc 100644 --- a/crates/ra_hir_def/src/generics.rs +++ b/crates/ra_hir_def/src/generics.rs | |||
@@ -25,7 +25,6 @@ pub struct GenericParam { | |||
25 | /// Data about the generic parameters of a function, struct, impl, etc. | 25 | /// Data about the generic parameters of a function, struct, impl, etc. |
26 | #[derive(Clone, PartialEq, Eq, Debug)] | 26 | #[derive(Clone, PartialEq, Eq, Debug)] |
27 | pub struct GenericParams { | 27 | pub struct GenericParams { |
28 | pub def: GenericDefId, | ||
29 | pub parent_params: Option<Arc<GenericParams>>, | 28 | pub parent_params: Option<Arc<GenericParams>>, |
30 | pub params: Vec<GenericParam>, | 29 | pub params: Vec<GenericParam>, |
31 | pub where_predicates: Vec<WherePredicate>, | 30 | pub where_predicates: Vec<WherePredicate>, |
@@ -56,7 +55,7 @@ impl GenericParams { | |||
56 | parent_params: Option<Arc<GenericParams>>, | 55 | parent_params: Option<Arc<GenericParams>>, |
57 | ) -> GenericParams { | 56 | ) -> GenericParams { |
58 | let mut generics = | 57 | let mut generics = |
59 | GenericParams { def, params: Vec::new(), parent_params, where_predicates: Vec::new() }; | 58 | GenericParams { params: Vec::new(), parent_params, where_predicates: Vec::new() }; |
60 | let start = generics.parent_params.as_ref().map(|p| p.params.len()).unwrap_or(0) as u32; | 59 | let start = generics.parent_params.as_ref().map(|p| p.params.len()).unwrap_or(0) as u32; |
61 | // FIXME: add `: Sized` bound for everything except for `Self` in traits | 60 | // FIXME: add `: Sized` bound for everything except for `Self` in traits |
62 | match def { | 61 | match def { |