language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-01 06:11:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Allow non-path default type parameters

Browse source
This commit is contained in:
Aleksey Kladov 2019-11-20 11:42:58 +03:00
parent 4340d9b0e4
commit 0e771915fa
6 changed files with 38 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

11
crates/ra_hir/src/generics.rs
View file

@ -5,12 +5,9 @@
use std::sync::Arc;
use hir_def::{
path::Path,
type_ref::{TypeBound, TypeRef},
};
use hir_def::type_ref::{TypeBound, TypeRef};
use hir_expand::name::{self, AsName};
use ra_syntax::ast::{self, DefaultTypeParamOwner, NameOwner, TypeBoundsOwner, TypeParamsOwner};
use ra_syntax::ast::{self, NameOwner, TypeBoundsOwner, TypeParamsOwner};
use crate::{
db::{AstDatabase, DefDatabase, HirDatabase},
@ -24,7 +21,7 @@ pub struct GenericParam {
// FIXME: give generic params proper IDs
pub idx: u32,
pub name: Name,
pub default: Option<Path>,
pub default: Option<TypeRef>,
}
/// Data about the generic parameters of a function, struct, impl, etc.
@ -140,7 +137,7 @@ impl GenericParams {
for (idx, type_param) in params.type_params().enumerate() {
let name = type_param.name().map_or_else(Name::missing, |it| it.as_name());
// FIXME: Use `Path::from_src`
let default = type_param.default_type().and_then(|t| t.path()).and_then(Path::from_ast);
let default = type_param.default_type().map(TypeRef::from_ast);
let param = GenericParam { idx: idx as u32 + start, name: name.clone(), default };
self.params.push(param);