diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-02-28 19:56:16 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2021-02-28 19:56:16 +0000 |
commit | 23d7dbfa5e7ba2cebf8c3f79b5d31285d79c1527 (patch) | |
tree | c99eee1f422e009f039bc5c1fd68120bc217d417 /crates/hir_ty/src/lower.rs | |
parent | 2fc137b70f9d455676cc99a1a5c7e6e10c3e7cc2 (diff) | |
parent | a3fd2faba5b0736fd51c7b94cae55e0a9609cdb0 (diff) |
Merge #7814
7814: Turn Ty::Tuple variant into a tuple-variant r=Veykril a=Veykril
bors r+
Co-authored-by: Lukas Wirth <[email protected]>
Diffstat (limited to 'crates/hir_ty/src/lower.rs')
-rw-r--r-- | crates/hir_ty/src/lower.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/hir_ty/src/lower.rs b/crates/hir_ty/src/lower.rs index 6b919a09e..84734bc0b 100644 --- a/crates/hir_ty/src/lower.rs +++ b/crates/hir_ty/src/lower.rs | |||
@@ -148,7 +148,7 @@ impl Ty { | |||
148 | TypeRef::Never => Ty::Never, | 148 | TypeRef::Never => Ty::Never, |
149 | TypeRef::Tuple(inner) => { | 149 | TypeRef::Tuple(inner) => { |
150 | let inner_tys: Arc<[Ty]> = inner.iter().map(|tr| Ty::from_hir(ctx, tr)).collect(); | 150 | let inner_tys: Arc<[Ty]> = inner.iter().map(|tr| Ty::from_hir(ctx, tr)).collect(); |
151 | Ty::Tuple { cardinality: inner_tys.len() as u16, substs: Substs(inner_tys) } | 151 | Ty::Tuple(inner_tys.len(), Substs(inner_tys)) |
152 | } | 152 | } |
153 | TypeRef::Path(path) => { | 153 | TypeRef::Path(path) => { |
154 | let (ty, res_) = Ty::from_hir_path(ctx, path); | 154 | let (ty, res_) = Ty::from_hir_path(ctx, path); |
@@ -1100,10 +1100,10 @@ fn type_for_type_alias(db: &dyn HirDatabase, t: TypeAliasId) -> Binders<Ty> { | |||
1100 | let resolver = t.resolver(db.upcast()); | 1100 | let resolver = t.resolver(db.upcast()); |
1101 | let ctx = | 1101 | let ctx = |
1102 | TyLoweringContext::new(db, &resolver).with_type_param_mode(TypeParamLoweringMode::Variable); | 1102 | TyLoweringContext::new(db, &resolver).with_type_param_mode(TypeParamLoweringMode::Variable); |
1103 | let substs = Substs::bound_vars(&generics, DebruijnIndex::INNERMOST); | ||
1104 | if db.type_alias_data(t).is_extern { | 1103 | if db.type_alias_data(t).is_extern { |
1105 | Binders::new(substs.len(), Ty::ForeignType(t, substs)) | 1104 | Binders::new(0, Ty::ForeignType(t)) |
1106 | } else { | 1105 | } else { |
1106 | let substs = Substs::bound_vars(&generics, DebruijnIndex::INNERMOST); | ||
1107 | let type_ref = &db.type_alias_data(t).type_ref; | 1107 | let type_ref = &db.type_alias_data(t).type_ref; |
1108 | let inner = Ty::from_hir(&ctx, type_ref.as_ref().unwrap_or(&TypeRef::Error)); | 1108 | let inner = Ty::from_hir(&ctx, type_ref.as_ref().unwrap_or(&TypeRef::Error)); |
1109 | Binders::new(substs.len(), inner) | 1109 | Binders::new(substs.len(), inner) |