From 5183c9f08345c664237ae138e86f96ff46714f15 Mon Sep 17 00:00:00 2001 From: Lukas Wirth Date: Sun, 28 Feb 2021 01:20:04 +0100 Subject: Introduce TypeCtor::Scalar --- crates/hir_ty/src/display.rs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'crates/hir_ty/src/display.rs') diff --git a/crates/hir_ty/src/display.rs b/crates/hir_ty/src/display.rs index 271fcbfaf..cfe9cedb0 100644 --- a/crates/hir_ty/src/display.rs +++ b/crates/hir_ty/src/display.rs @@ -4,7 +4,8 @@ use std::{borrow::Cow, fmt}; use crate::{ db::HirDatabase, utils::generics, ApplicationTy, CallableDefId, FnSig, GenericPredicate, - Lifetime, Obligation, OpaqueTy, OpaqueTyId, ProjectionTy, Substs, TraitRef, Ty, TypeCtor, + Lifetime, Obligation, OpaqueTy, OpaqueTyId, ProjectionTy, Scalar, Substs, TraitRef, Ty, + TypeCtor, }; use arrayvec::ArrayVec; use hir_def::{ @@ -241,10 +242,11 @@ impl HirDisplay for ApplicationTy { } match self.ctor { - TypeCtor::Bool => write!(f, "bool")?, - TypeCtor::Char => write!(f, "char")?, - TypeCtor::Int(t) => write!(f, "{}", t)?, - TypeCtor::Float(t) => write!(f, "{}", t)?, + TypeCtor::Scalar(Scalar::Bool) => write!(f, "bool")?, + TypeCtor::Scalar(Scalar::Char) => write!(f, "char")?, + TypeCtor::Scalar(Scalar::Float(t)) => write!(f, "{}", t)?, + TypeCtor::Scalar(Scalar::Int(t)) => write!(f, "{}", t)?, + TypeCtor::Scalar(Scalar::Uint(t)) => write!(f, "{}", t)?, TypeCtor::Str => write!(f, "str")?, TypeCtor::Slice => { let t = self.parameters.as_single(); -- cgit v1.2.3 From 7c2dd85a32e320fd412a720ea5b847c66bf246ae Mon Sep 17 00:00:00 2001 From: Lukas Wirth Date: Sun, 28 Feb 2021 10:58:34 +0100 Subject: Use chalk_ir::Scalar directly --- crates/hir_ty/src/display.rs | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'crates/hir_ty/src/display.rs') 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 @@ use std::{borrow::Cow, fmt}; use crate::{ - db::HirDatabase, utils::generics, ApplicationTy, CallableDefId, FnSig, GenericPredicate, - Lifetime, Obligation, OpaqueTy, OpaqueTyId, ProjectionTy, Scalar, Substs, TraitRef, Ty, - TypeCtor, + db::HirDatabase, primitive, utils::generics, ApplicationTy, CallableDefId, FnSig, + GenericPredicate, Lifetime, Obligation, OpaqueTy, OpaqueTyId, ProjectionTy, Scalar, Substs, + TraitRef, Ty, TypeCtor, }; use arrayvec::ArrayVec; use hir_def::{ @@ -244,9 +244,11 @@ impl HirDisplay for ApplicationTy { match self.ctor { TypeCtor::Scalar(Scalar::Bool) => write!(f, "bool")?, TypeCtor::Scalar(Scalar::Char) => write!(f, "char")?, - TypeCtor::Scalar(Scalar::Float(t)) => write!(f, "{}", t)?, - TypeCtor::Scalar(Scalar::Int(t)) => write!(f, "{}", t)?, - TypeCtor::Scalar(Scalar::Uint(t)) => write!(f, "{}", t)?, + TypeCtor::Scalar(Scalar::Float(t)) => { + write!(f, "{}", primitive::float_ty_to_string(t))? + } + TypeCtor::Scalar(Scalar::Int(t)) => write!(f, "{}", primitive::int_ty_to_string(t))?, + TypeCtor::Scalar(Scalar::Uint(t)) => write!(f, "{}", primitive::uint_ty_to_string(t))?, TypeCtor::Str => write!(f, "str")?, TypeCtor::Slice => { let t = self.parameters.as_single(); -- cgit v1.2.3