diff options
| author | Seivan Heidari <[email protected]> | 2019-11-18 09:12:09 +0000 |
|---|---|---|
| committer | Seivan Heidari <[email protected]> | 2019-11-18 09:12:09 +0000 |
| commit | aceeb0b85ee8228503f970ea602af71ff22216a0 (patch) | |
| tree | cba11ded2f03cec11720b585c50eb6cf1bdabf8d /crates | |
| parent | e5bbb476800c9bf24820701ec9252153ba07cf6a (diff) | |
| parent | 396853defb1359dfabcab4eaa41ab3f2230b1582 (diff) | |
Merge branch 'master' of https://github.com/rust-analyzer/rust-analyzer into feature/themes
Diffstat (limited to 'crates')
| -rw-r--r-- | crates/ra_hir/src/generics.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/ra_hir/src/generics.rs b/crates/ra_hir/src/generics.rs index 9c261eda9..c35482ae8 100644 --- a/crates/ra_hir/src/generics.rs +++ b/crates/ra_hir/src/generics.rs | |||
| @@ -22,9 +22,9 @@ use crate::{ | |||
| 22 | #[derive(Clone, PartialEq, Eq, Debug)] | 22 | #[derive(Clone, PartialEq, Eq, Debug)] |
| 23 | pub struct GenericParam { | 23 | pub struct GenericParam { |
| 24 | // FIXME: give generic params proper IDs | 24 | // FIXME: give generic params proper IDs |
| 25 | pub(crate) idx: u32, | 25 | pub idx: u32, |
| 26 | pub(crate) name: Name, | 26 | pub name: Name, |
| 27 | pub(crate) default: Option<Path>, | 27 | pub default: Option<Path>, |
| 28 | } | 28 | } |
| 29 | 29 | ||
| 30 | /// Data about the generic parameters of a function, struct, impl, etc. | 30 | /// Data about the generic parameters of a function, struct, impl, etc. |