3 files changed, 9 insertions, 11 deletions

diff --git a/crates/ra_hir_ty/src/lower.rs b/crates/ra_hir_ty/src/lower.rs
index 006101f2f..25c894c95 100644
--- a/crates/ra_hir_ty/src/lower.rs
+++ b/crates/ra_hir_ty/src/lower.rs
@@ -729,14 +729,12 @@ fn fn_sig_for_enum_variant_constructor(db: &impl HirDatabase, def: EnumVariantId
     let var_data = &enum_data.variants[def.local_id];
     let fields = var_data.variant_data.fields();
     let resolver = def.parent.resolver(db);
-    let ctx = TyLoweringContext::new(db, &resolver);
+    let ctx = TyLoweringContext::new(db, &resolver)
+        .with_type_param_mode(TypeParamLoweringMode::Variable);
     let params =
         fields.iter().map(|(_, field)| Ty::from_hir(&ctx, &field.type_ref)).collect::<Vec<_>>();
-    let generics = generics(db, def.parent.into());
-    let substs = Substs::bound_vars(&generics);
-    let ret = type_for_adt(db, def.parent.into()).subst(&substs);
-    let num_binders = generics.len();
-    Binders::new(num_binders, FnSig::from_params_and_return(params, ret))
+    let ret = type_for_adt(db, def.parent.into());
+    Binders::new(ret.num_binders, FnSig::from_params_and_return(params, ret.value))
 }
 
 /// Build the type of a tuple enum variant constructor.
diff --git a/crates/ra_hir_ty/src/tests/simple.rs b/crates/ra_hir_ty/src/tests/simple.rs
index b08355227..3803f5938 100644
--- a/crates/ra_hir_ty/src/tests/simple.rs
+++ b/crates/ra_hir_ty/src/tests/simple.rs
@@ -1169,16 +1169,16 @@ fn test() {
 "#),
         @r###"
     [76; 184) '{     ...one; }': ()
-    [82; 83) 'A': A<i32>(T) -> A<T>
+    [82; 83) 'A': A<i32>(i32) -> A<i32>
     [82; 87) 'A(42)': A<i32>
     [84; 86) '42': i32
-    [93; 94) 'A': A<u128>(T) -> A<T>
+    [93; 94) 'A': A<u128>(u128) -> A<u128>
     [93; 102) 'A(42u128)': A<u128>
     [95; 101) '42u128': u128
-    [108; 112) 'Some': Some<&str>(T) -> Option<T>
+    [108; 112) 'Some': Some<&str>(&str) -> Option<&str>
     [108; 117) 'Some("x")': Option<&str>
     [113; 116) '"x"': &str
-    [123; 135) 'Option::Some': Some<&str>(T) -> Option<T>
+    [123; 135) 'Option::Some': Some<&str>(&str) -> Option<&str>
     [123; 140) 'Option...e("x")': Option<&str>
     [136; 139) '"x"': &str
     [146; 150) 'None': Option<{unknown}>
diff --git a/crates/ra_hir_ty/src/tests/traits.rs b/crates/ra_hir_ty/src/tests/traits.rs
index eae6e9681..9ff396ad5 100644
--- a/crates/ra_hir_ty/src/tests/traits.rs
+++ b/crates/ra_hir_ty/src/tests/traits.rs
@@ -1322,7 +1322,7 @@ fn test() {
     [173; 175) '{}': ()
     [189; 308) '{     ... 1); }': ()
     [199; 200) 'x': Option<u32>
-    [203; 215) 'Option::Some': Some<u32>(T) -> Option<T>
+    [203; 215) 'Option::Some': Some<u32>(u32) -> Option<u32>
     [203; 221) 'Option...(1u32)': Option<u32>
     [216; 220) '1u32': u32
     [227; 228) 'x': Option<u32>