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

Formatting

Browse source
This commit is contained in:
Florian Diebold 2020-02-07 15:13:15 +01:00
parent 6787f124b5
commit dded90a748
12 changed files with 98 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

17
crates/ra_hir_def/src/generics.rs
View file

@ -61,7 +61,7 @@ pub struct WherePredicate {
pub enum WherePredicateTarget {
TypeRef(TypeRef),
/// For desugared where predicates that can directly refer to a type param.
TypeParam(LocalTypeParamId)
TypeParam(LocalTypeParamId),
}
type SourceMap = ArenaMap<LocalTypeParamId, Either<ast::TraitDef, ast::TypeParam>>;
@ -197,7 +197,8 @@ impl GenericParams {
return;
}
let bound = TypeBound::from_ast(bound);
self.where_predicates.push(WherePredicate { target: WherePredicateTarget::TypeRef(type_ref), bound });
self.where_predicates
.push(WherePredicate { target: WherePredicateTarget::TypeRef(type_ref), bound });
}
fn fill_implicit_impl_trait_args(&mut self, type_ref: &TypeRef) {
@ -212,7 +213,7 @@ impl GenericParams {
for bound in bounds {
self.where_predicates.push(WherePredicate {
target: WherePredicateTarget::TypeParam(param_id),
bound: bound.clone()
bound: bound.clone(),
});
}
}
@ -226,9 +227,13 @@ impl GenericParams {
}
pub fn find_trait_self_param(&self) -> Option<LocalTypeParamId> {
self.types
.iter()
.find_map(|(id, p)| if p.provenance == TypeParamProvenance::TraitSelf { Some(id) } else { None })
self.types.iter().find_map(|(id, p)| {
if p.provenance == TypeParamProvenance::TraitSelf {
Some(id)
} else {
None
}
})
}
}