diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-02-02 15:40:43 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2021-02-02 15:40:43 +0000 |
commit | 12e8cc4aa29f616e43b4951e18b1f1f231e539a3 (patch) | |
tree | 32b870bd9cf0e96d3c086c40febf5a9499f533af /crates/hir_ty/src/traits | |
parent | 042e07d89171fa5dd8ba4fc572c183687382c0d7 (diff) | |
parent | 6b60206669fb0f48821cc16cf5fea09c2e310728 (diff) |
Merge #7523
7523: Bump chalk and rustc_lexer r=lnicola a=lnicola
bors r+
Co-authored-by: Laurențiu Nicola <[email protected]>
Diffstat (limited to 'crates/hir_ty/src/traits')
-rw-r--r-- | crates/hir_ty/src/traits/chalk.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/hir_ty/src/traits/chalk.rs b/crates/hir_ty/src/traits/chalk.rs index cfb756158..d74c83737 100644 --- a/crates/hir_ty/src/traits/chalk.rs +++ b/crates/hir_ty/src/traits/chalk.rs | |||
@@ -675,7 +675,7 @@ pub(crate) fn fn_def_variance_query( | |||
675 | ) -> Variances { | 675 | ) -> Variances { |
676 | let callable_def: CallableDefId = from_chalk(db, fn_def_id); | 676 | let callable_def: CallableDefId = from_chalk(db, fn_def_id); |
677 | let generic_params = generics(db.upcast(), callable_def.into()); | 677 | let generic_params = generics(db.upcast(), callable_def.into()); |
678 | Variances::from( | 678 | Variances::from_iter( |
679 | &Interner, | 679 | &Interner, |
680 | std::iter::repeat(chalk_ir::Variance::Invariant).take(generic_params.len()), | 680 | std::iter::repeat(chalk_ir::Variance::Invariant).take(generic_params.len()), |
681 | ) | 681 | ) |
@@ -688,7 +688,7 @@ pub(crate) fn adt_variance_query( | |||
688 | ) -> Variances { | 688 | ) -> Variances { |
689 | let adt: crate::AdtId = from_chalk(db, adt_id); | 689 | let adt: crate::AdtId = from_chalk(db, adt_id); |
690 | let generic_params = generics(db.upcast(), adt.into()); | 690 | let generic_params = generics(db.upcast(), adt.into()); |
691 | Variances::from( | 691 | Variances::from_iter( |
692 | &Interner, | 692 | &Interner, |
693 | std::iter::repeat(chalk_ir::Variance::Invariant).take(generic_params.len()), | 693 | std::iter::repeat(chalk_ir::Variance::Invariant).take(generic_params.len()), |
694 | ) | 694 | ) |