aboutsummaryrefslogtreecommitdiff
path: root/crates
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2020-11-26 20:50:16 +0000
committerGitHub <[email protected]>2020-11-26 20:50:16 +0000
commitbb2c6ceee7dd4daadd2e67eddc92357d2db129f0 (patch)
tree2f13bee01adebafbf827686e8065bbf240f55d59 /crates
parentfc0354b2803bccfeb6e0c3335a5d4e52288c05b4 (diff)
parent6501c9445ea161c6e1f47290ac90ac1efeaa8970 (diff)
Merge #6646
6646: Remove single r#trait identifer usage r=Veykril a=Veykril bors r+ Co-authored-by: Lukas Wirth <[email protected]>
Diffstat (limited to 'crates')
-rw-r--r--crates/hir/src/code_model.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/hir/src/code_model.rs b/crates/hir/src/code_model.rs
index 37ed092ad..f06b5cd9f 100644
--- a/crates/hir/src/code_model.rs
+++ b/crates/hir/src/code_model.rs
@@ -1420,11 +1420,11 @@ impl Type {
1420 pub fn normalize_trait_assoc_type( 1420 pub fn normalize_trait_assoc_type(
1421 &self, 1421 &self,
1422 db: &dyn HirDatabase, 1422 db: &dyn HirDatabase,
1423 r#trait: Trait, 1423 trait_: Trait,
1424 args: &[Type], 1424 args: &[Type],
1425 alias: TypeAlias, 1425 alias: TypeAlias,
1426 ) -> Option<Type> { 1426 ) -> Option<Type> {
1427 let subst = Substs::build_for_def(db, r#trait.id) 1427 let subst = Substs::build_for_def(db, trait_.id)
1428 .push(self.ty.value.clone()) 1428 .push(self.ty.value.clone())
1429 .fill(args.iter().map(|t| t.ty.value.clone())) 1429 .fill(args.iter().map(|t| t.ty.value.clone()))
1430 .build(); 1430 .build();