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/display.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/display.rs')
-rw-r--r-- | crates/hir_ty/src/display.rs | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/crates/hir_ty/src/display.rs b/crates/hir_ty/src/display.rs index cd9dcf6c0..4a25a49e3 100644 --- a/crates/hir_ty/src/display.rs +++ b/crates/hir_ty/src/display.rs | |||
@@ -330,7 +330,7 @@ impl HirDisplay for Ty { | |||
330 | write!(f, "{}", ty_display)?; | 330 | write!(f, "{}", ty_display)?; |
331 | } | 331 | } |
332 | } | 332 | } |
333 | Ty::Tuple { substs, .. } => { | 333 | Ty::Tuple(_, substs) => { |
334 | if substs.len() == 1 { | 334 | if substs.len() == 1 { |
335 | write!(f, "(")?; | 335 | write!(f, "(")?; |
336 | substs[0].hir_fmt(f)?; | 336 | substs[0].hir_fmt(f)?; |
@@ -471,14 +471,9 @@ impl HirDisplay for Ty { | |||
471 | projection_ty.hir_fmt(f)?; | 471 | projection_ty.hir_fmt(f)?; |
472 | } | 472 | } |
473 | } | 473 | } |
474 | Ty::ForeignType(type_alias, parameters) => { | 474 | Ty::ForeignType(type_alias) => { |
475 | let type_alias = f.db.type_alias_data(*type_alias); | 475 | let type_alias = f.db.type_alias_data(*type_alias); |
476 | write!(f, "{}", type_alias.name)?; | 476 | write!(f, "{}", type_alias.name)?; |
477 | if parameters.len() > 0 { | ||
478 | write!(f, "<")?; | ||
479 | f.write_joined(&*parameters.0, ", ")?; | ||
480 | write!(f, ">")?; | ||
481 | } | ||
482 | } | 477 | } |
483 | Ty::OpaqueType(opaque_ty_id, parameters) => { | 478 | Ty::OpaqueType(opaque_ty_id, parameters) => { |
484 | match opaque_ty_id { | 479 | match opaque_ty_id { |