diff options
author | Seivan Heidari <[email protected]> | 2019-11-21 00:11:41 +0000 |
---|---|---|
committer | Seivan Heidari <[email protected]> | 2019-11-21 00:11:41 +0000 |
commit | 358a1bcd708c622836723e5201b6de77cc9ff327 (patch) | |
tree | aeff9c96a6059fa2b02e7c87ec88753bc7993d8d /crates/ra_hir/src/ty.rs | |
parent | 1e2d090ab8a9bda18f148b894b7948eb05b976e6 (diff) | |
parent | 612a72fc4ea4376920f2a7da7b3c334227c1716c (diff) |
Merge branch 'master' of https://github.com/rust-analyzer/rust-analyzer into feature/themes
Diffstat (limited to 'crates/ra_hir/src/ty.rs')
-rw-r--r-- | crates/ra_hir/src/ty.rs | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/crates/ra_hir/src/ty.rs b/crates/ra_hir/src/ty.rs index b7f50b714..36ece723f 100644 --- a/crates/ra_hir/src/ty.rs +++ b/crates/ra_hir/src/ty.rs | |||
@@ -3,8 +3,6 @@ | |||
3 | 3 | ||
4 | mod autoderef; | 4 | mod autoderef; |
5 | pub(crate) mod primitive; | 5 | pub(crate) mod primitive; |
6 | #[cfg(test)] | ||
7 | mod tests; | ||
8 | pub(crate) mod traits; | 6 | pub(crate) mod traits; |
9 | pub(crate) mod method_resolution; | 7 | pub(crate) mod method_resolution; |
10 | mod op; | 8 | mod op; |
@@ -12,6 +10,9 @@ mod lower; | |||
12 | mod infer; | 10 | mod infer; |
13 | pub(crate) mod display; | 11 | pub(crate) mod display; |
14 | 12 | ||
13 | #[cfg(test)] | ||
14 | mod tests; | ||
15 | |||
15 | use std::ops::Deref; | 16 | use std::ops::Deref; |
16 | use std::sync::Arc; | 17 | use std::sync::Arc; |
17 | use std::{fmt, iter, mem}; | 18 | use std::{fmt, iter, mem}; |
@@ -800,6 +801,10 @@ impl HirDisplay for &Ty { | |||
800 | 801 | ||
801 | impl HirDisplay for ApplicationTy { | 802 | impl HirDisplay for ApplicationTy { |
802 | fn hir_fmt(&self, f: &mut HirFormatter<impl HirDatabase>) -> fmt::Result { | 803 | fn hir_fmt(&self, f: &mut HirFormatter<impl HirDatabase>) -> fmt::Result { |
804 | if f.should_truncate() { | ||
805 | return write!(f, "…"); | ||
806 | } | ||
807 | |||
803 | match self.ctor { | 808 | match self.ctor { |
804 | TypeCtor::Bool => write!(f, "bool")?, | 809 | TypeCtor::Bool => write!(f, "bool")?, |
805 | TypeCtor::Char => write!(f, "char")?, | 810 | TypeCtor::Char => write!(f, "char")?, |
@@ -901,6 +906,10 @@ impl HirDisplay for ApplicationTy { | |||
901 | 906 | ||
902 | impl HirDisplay for ProjectionTy { | 907 | impl HirDisplay for ProjectionTy { |
903 | fn hir_fmt(&self, f: &mut HirFormatter<impl HirDatabase>) -> fmt::Result { | 908 | fn hir_fmt(&self, f: &mut HirFormatter<impl HirDatabase>) -> fmt::Result { |
909 | if f.should_truncate() { | ||
910 | return write!(f, "…"); | ||
911 | } | ||
912 | |||
904 | let trait_name = self | 913 | let trait_name = self |
905 | .associated_ty | 914 | .associated_ty |
906 | .parent_trait(f.db) | 915 | .parent_trait(f.db) |
@@ -919,6 +928,10 @@ impl HirDisplay for ProjectionTy { | |||
919 | 928 | ||
920 | impl HirDisplay for Ty { | 929 | impl HirDisplay for Ty { |
921 | fn hir_fmt(&self, f: &mut HirFormatter<impl HirDatabase>) -> fmt::Result { | 930 | fn hir_fmt(&self, f: &mut HirFormatter<impl HirDatabase>) -> fmt::Result { |
931 | if f.should_truncate() { | ||
932 | return write!(f, "…"); | ||
933 | } | ||
934 | |||
922 | match self { | 935 | match self { |
923 | Ty::Apply(a_ty) => a_ty.hir_fmt(f)?, | 936 | Ty::Apply(a_ty) => a_ty.hir_fmt(f)?, |
924 | Ty::Projection(p_ty) => p_ty.hir_fmt(f)?, | 937 | Ty::Projection(p_ty) => p_ty.hir_fmt(f)?, |
@@ -1001,6 +1014,10 @@ impl HirDisplay for Ty { | |||
1001 | 1014 | ||
1002 | impl TraitRef { | 1015 | impl TraitRef { |
1003 | fn hir_fmt_ext(&self, f: &mut HirFormatter<impl HirDatabase>, use_as: bool) -> fmt::Result { | 1016 | fn hir_fmt_ext(&self, f: &mut HirFormatter<impl HirDatabase>, use_as: bool) -> fmt::Result { |
1017 | if f.should_truncate() { | ||
1018 | return write!(f, "…"); | ||
1019 | } | ||
1020 | |||
1004 | self.substs[0].hir_fmt(f)?; | 1021 | self.substs[0].hir_fmt(f)?; |
1005 | if use_as { | 1022 | if use_as { |
1006 | write!(f, " as ")?; | 1023 | write!(f, " as ")?; |
@@ -1031,6 +1048,10 @@ impl HirDisplay for &GenericPredicate { | |||
1031 | 1048 | ||
1032 | impl HirDisplay for GenericPredicate { | 1049 | impl HirDisplay for GenericPredicate { |
1033 | fn hir_fmt(&self, f: &mut HirFormatter<impl HirDatabase>) -> fmt::Result { | 1050 | fn hir_fmt(&self, f: &mut HirFormatter<impl HirDatabase>) -> fmt::Result { |
1051 | if f.should_truncate() { | ||
1052 | return write!(f, "…"); | ||
1053 | } | ||
1054 | |||
1034 | match self { | 1055 | match self { |
1035 | GenericPredicate::Implemented(trait_ref) => trait_ref.hir_fmt(f)?, | 1056 | GenericPredicate::Implemented(trait_ref) => trait_ref.hir_fmt(f)?, |
1036 | GenericPredicate::Projection(projection_pred) => { | 1057 | GenericPredicate::Projection(projection_pred) => { |