From ae8a8020857080ea527cc1d0e57a592d6e587a64 Mon Sep 17 00:00:00 2001 From: Lukas Wirth Date: Sun, 13 Dec 2020 11:34:44 +0100 Subject: Ignore lifetime params in substitutions --- crates/hir_ty/src/infer/expr.rs | 7 ++++++- crates/hir_ty/src/lower.rs | 8 +++++++- 2 files changed, 13 insertions(+), 2 deletions(-) (limited to 'crates/hir_ty/src') diff --git a/crates/hir_ty/src/infer/expr.rs b/crates/hir_ty/src/infer/expr.rs index ca005bc99..2cdce2cef 100644 --- a/crates/hir_ty/src/infer/expr.rs +++ b/crates/hir_ty/src/infer/expr.rs @@ -856,7 +856,12 @@ impl<'a> InferenceContext<'a> { // handle provided type arguments if let Some(generic_args) = generic_args { // if args are provided, it should be all of them, but we can't rely on that - for arg in generic_args.args.iter().take(type_params) { + for arg in generic_args + .args + .iter() + .filter(|arg| matches!(arg, GenericArg::Type(_))) + .take(type_params) + { match arg { GenericArg::Type(type_ref) => { let ty = self.make_ty(type_ref); diff --git a/crates/hir_ty/src/lower.rs b/crates/hir_ty/src/lower.rs index 92f779360..8392cb770 100644 --- a/crates/hir_ty/src/lower.rs +++ b/crates/hir_ty/src/lower.rs @@ -565,7 +565,13 @@ fn substs_from_path_segment( if generic_args.has_self_type { self_params + type_params } else { type_params }; let skip = if generic_args.has_self_type && self_params == 0 { 1 } else { 0 }; // if args are provided, it should be all of them, but we can't rely on that - for arg in generic_args.args.iter().skip(skip).take(expected_num) { + for arg in generic_args + .args + .iter() + .filter(|arg| matches!(arg, GenericArg::Type(_))) + .skip(skip) + .take(expected_num) + { match arg { GenericArg::Type(type_ref) => { had_explicit_type_args = true; -- cgit v1.2.3