Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-28 14:03:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge #6646

Browse source 
6646: Remove single r#trait identifer usage r=Veykril a=Veykril

bors r+

Co-authored-by: Lukas Wirth <lukastw97@gmail.com>
This commit is contained in:
bors[bot] 2020-11-26 20:50:16 +00:00 committed by GitHub
commit bb2c6ceee7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
crates/hir/src/code_model.rs
View file

@ -1420,11 +1420,11 @@ impl Type {
pub fn normalize_trait_assoc_type( pub fn normalize_trait_assoc_type(
&self, &self,
db: &dyn HirDatabase, db: &dyn HirDatabase,
r#trait: Trait, trait_: Trait,
args: &[Type], args: &[Type],
alias: TypeAlias, alias: TypeAlias,
) -> Option<Type> { ) -> Option<Type> {
let subst = Substs::build_for_def(db, r#trait.id) let subst = Substs::build_for_def(db, trait_.id)
.push(self.ty.value.clone()) .push(self.ty.value.clone())
.fill(args.iter().map(|t| t.ty.value.clone())) .fill(args.iter().map(|t| t.ty.value.clone()))
.build(); .build();