Skip to content

Remove pretty_ty and use rustc_public's formatter instead #4243

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 29, 2025
Merged

Remove pretty_ty and use rustc_public's formatter instead #4243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 16 additions & 34 deletions kani-compiler/src/codegen_cprover_gotoc/codegen/intrinsic.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,8 +563,7 @@ impl GotocCtx<'_> {
self.tcx,
span,
format!(
"Type check failed for intrinsic `{name}`: Expected {expected}, found {}",
self.pretty_ty(actual)
"Type check failed for intrinsic `{name}`: Expected {expected}, found {actual}"
),
);
self.tcx.dcx().abort_if_errors();
Expand Down Expand Up @@ -715,10 +714,7 @@ impl GotocCtx<'_> {
if layout.is_uninhabited() {
return self.codegen_fatal_error(
PropertyClass::SafetyCheck,
&format!(
"attempted to instantiate uninhabited type `{}`",
self.pretty_ty(*target_ty)
),
&format!("attempted to instantiate uninhabited type `{}`", *target_ty),
span,
);
}
Expand All @@ -736,10 +732,7 @@ impl GotocCtx<'_> {
{
return self.codegen_fatal_error(
PropertyClass::SafetyCheck,
&format!(
"attempted to zero-initialize type `{}`, which is invalid",
self.pretty_ty(*target_ty)
),
&format!("attempted to zero-initialize type `{}`, which is invalid", *target_ty),
span,
);
}
Expand All @@ -757,7 +750,7 @@ impl GotocCtx<'_> {
PropertyClass::SafetyCheck,
&format!(
"attempted to leave type `{}` uninitialized, which is invalid",
self.pretty_ty(*target_ty)
*target_ty
),
span,
);
Expand Down Expand Up @@ -1142,7 +1135,7 @@ impl GotocCtx<'_> {
} else {
let err_msg = format!(
"simd_shuffle index must be a SIMD vector of `u32`, got `{}`",
self.pretty_ty(farg_types[2])
farg_types[2]
);
utils::span_err(self.tcx, span, err_msg);
// Return a dummy value
Expand Down Expand Up @@ -1281,10 +1274,8 @@ impl GotocCtx<'_> {
let (_, vector_base_type) = self.simd_size_and_type(rust_arg_types[0]);
if rust_ret_type != vector_base_type {
let err_msg = format!(
"expected return type `{}` (element of input `{}`), found `{}`",
self.pretty_ty(vector_base_type),
self.pretty_ty(rust_arg_types[0]),
self.pretty_ty(rust_ret_type)
"expected return type `{vector_base_type}` (element of input `{}`), found `{rust_ret_type}`",
rust_arg_types[0]
);
utils::span_err(self.tcx, span, err_msg);
}
Expand Down Expand Up @@ -1322,10 +1313,8 @@ impl GotocCtx<'_> {
let (_, vector_base_type) = self.simd_size_and_type(rust_arg_types[0]);
if vector_base_type != rust_arg_types[2] {
let err_msg = format!(
"expected inserted type `{}` (element of input `{}`), found `{}`",
self.pretty_ty(vector_base_type),
self.pretty_ty(rust_arg_types[0]),
self.pretty_ty(rust_arg_types[2]),
"expected inserted type `{vector_base_type}` (element of input `{}`), found `{}`",
rust_arg_types[0], rust_arg_types[2],
);
utils::span_err(self.tcx, span, err_msg);
}
Expand Down Expand Up @@ -1389,10 +1378,9 @@ impl GotocCtx<'_> {
if arg1.typ().len().unwrap() != ret_typ.len().unwrap() {
let err_msg = format!(
"expected return type with length {} (same as input type `{}`), \
found `{}` with length {}",
found `{rust_ret_type}` with length {}",
arg1.typ().len().unwrap(),
self.pretty_ty(rust_arg_types[0]),
self.pretty_ty(rust_ret_type),
rust_arg_types[0],
ret_typ.len().unwrap()
);
utils::span_err(self.tcx, span, err_msg);
Expand All @@ -1401,9 +1389,7 @@ impl GotocCtx<'_> {
if !ret_typ.base_type().unwrap().is_integer() {
let (_, rust_base_type) = self.simd_size_and_type(rust_ret_type);
let err_msg = format!(
"expected return type with integer elements, found `{}` with non-integer `{}`",
self.pretty_ty(rust_ret_type),
self.pretty_ty(rust_base_type),
"expected return type with integer elements, found `{rust_ret_type}` with non-integer `{rust_base_type}`"
);
utils::span_err(self.tcx, span, err_msg);
}
Expand Down Expand Up @@ -1591,19 +1577,15 @@ impl GotocCtx<'_> {
let (ret_type_len, ret_type_subtype) = self.simd_size_and_type(rust_ret_type);
if ret_type_len != n {
let err_msg = format!(
"expected return type of length {n}, found `{}` with length {ret_type_len}",
self.pretty_ty(rust_ret_type),
"expected return type of length {n}, found `{rust_ret_type}` with length {ret_type_len}"
);
utils::span_err(self.tcx, span, err_msg);
}
if vec_subtype != ret_type_subtype {
let err_msg = format!(
"expected return element type `{}` (element of input `{}`), \
found `{}` with element type `{}`",
self.pretty_ty(vec_subtype),
self.pretty_ty(rust_arg_types[0]),
self.pretty_ty(rust_ret_type),
self.pretty_ty(ret_type_subtype),
"expected return element type `{vec_subtype}` (element of input `{}`), \
found `{rust_ret_type}` with element type `{ret_type_subtype}`",
rust_arg_types[0]
);
utils::span_err(self.tcx, span, err_msg);
}
Expand Down
8 changes: 0 additions & 8 deletions kani-compiler/src/codegen_cprover_gotoc/codegen/ty_stable.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,14 +109,6 @@ impl<'tcx> GotocCtx<'tcx> {
}
}

/// Convert a type into a user readable type representation.
///
/// This should be replaced by StableMIR `pretty_ty()` after
/// <https://github.com/rust-lang/rust/pull/118364> is merged.
pub fn pretty_ty(&self, ty: Ty) -> String {
ty.to_string()
}

pub fn requires_caller_location(&self, instance: Instance) -> bool {
let instance_internal = rustc_internal::internal(self.tcx, instance);
instance_internal.def.requires_caller_location(self.tcx)
Expand Down
Loading