aboutsummaryrefslogtreecommitdiff
path: root/crates/hir_ty/src/display.rs
diff options
context:
space:
mode:
authorLukas Wirth <[email protected]>2021-02-28 09:58:34 +0000
committerLukas Wirth <[email protected]>2021-02-28 10:06:37 +0000
commit7c2dd85a32e320fd412a720ea5b847c66bf246ae (patch)
treefc5fb1d9ae0ae59f4d7eafe68720005d095bd360 /crates/hir_ty/src/display.rs
parent5183c9f08345c664237ae138e86f96ff46714f15 (diff)
Use chalk_ir::Scalar directly
Diffstat (limited to 'crates/hir_ty/src/display.rs')
-rw-r--r--crates/hir_ty/src/display.rs14
1 files changed, 8 insertions, 6 deletions
diff --git a/crates/hir_ty/src/display.rs b/crates/hir_ty/src/display.rs
index cfe9cedb0..b4801cb21 100644
--- a/crates/hir_ty/src/display.rs
+++ b/crates/hir_ty/src/display.rs
@@ -3,9 +3,9 @@
3use std::{borrow::Cow, fmt}; 3use std::{borrow::Cow, fmt};
4 4
5use crate::{ 5use crate::{
6 db::HirDatabase, utils::generics, ApplicationTy, CallableDefId, FnSig, GenericPredicate, 6 db::HirDatabase, primitive, utils::generics, ApplicationTy, CallableDefId, FnSig,
7 Lifetime, Obligation, OpaqueTy, OpaqueTyId, ProjectionTy, Scalar, Substs, TraitRef, Ty, 7 GenericPredicate, Lifetime, Obligation, OpaqueTy, OpaqueTyId, ProjectionTy, Scalar, Substs,
8 TypeCtor, 8 TraitRef, Ty, TypeCtor,
9}; 9};
10use arrayvec::ArrayVec; 10use arrayvec::ArrayVec;
11use hir_def::{ 11use hir_def::{
@@ -244,9 +244,11 @@ impl HirDisplay for ApplicationTy {
244 match self.ctor { 244 match self.ctor {
245 TypeCtor::Scalar(Scalar::Bool) => write!(f, "bool")?, 245 TypeCtor::Scalar(Scalar::Bool) => write!(f, "bool")?,
246 TypeCtor::Scalar(Scalar::Char) => write!(f, "char")?, 246 TypeCtor::Scalar(Scalar::Char) => write!(f, "char")?,
247 TypeCtor::Scalar(Scalar::Float(t)) => write!(f, "{}", t)?, 247 TypeCtor::Scalar(Scalar::Float(t)) => {
248 TypeCtor::Scalar(Scalar::Int(t)) => write!(f, "{}", t)?, 248 write!(f, "{}", primitive::float_ty_to_string(t))?
249 TypeCtor::Scalar(Scalar::Uint(t)) => write!(f, "{}", t)?, 249 }
250 TypeCtor::Scalar(Scalar::Int(t)) => write!(f, "{}", primitive::int_ty_to_string(t))?,
251 TypeCtor::Scalar(Scalar::Uint(t)) => write!(f, "{}", primitive::uint_ty_to_string(t))?,
250 TypeCtor::Str => write!(f, "str")?, 252 TypeCtor::Str => write!(f, "str")?,
251 TypeCtor::Slice => { 253 TypeCtor::Slice => {
252 let t = self.parameters.as_single(); 254 let t = self.parameters.as_single();