PublicArchive/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2026-05-06 08:36:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #156132 - nnethercote:more-lifting-tweaks, r=oli-obk

Browse Source 
More lifting tweaks

Details in individual commits.

r? @oli-obk
This commit is contained in:
Jacob Pratt
2026-05-04 04:25:25 -04:00
committed by GitHub
parent 06c89cfdd2 2cf48841f1
commit 037e2b0bb0
8 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/rustc_middle/src/ty/diagnostics.rs
+2 -2
View File
@@ -22,7 +22,7 @@ use crate::ty::{
impl IntoDiagArg for Ty<'_> {
fn into_diag_arg(self, path: &mut Option<std::path::PathBuf>) -> rustc_errors::DiagArgValue {
ty::tls::with(|tcx| {
let ty = tcx.short_string(self, path);
let ty = tcx.short_string(tcx.lift(self), path);
DiagArgValue::Str(std::borrow::Cow::Owned(ty))
})
}
@@ -31,7 +31,7 @@ impl IntoDiagArg for Ty<'_> {
impl IntoDiagArg for Instance<'_> {
fn into_diag_arg(self, path: &mut Option<std::path::PathBuf>) -> rustc_errors::DiagArgValue {
ty::tls::with(|tcx| {
let instance = tcx.short_string_namespace(self, path, Namespace::ValueNS);
let instance = tcx.short_string_namespace(tcx.lift(self), path, Namespace::ValueNS);
DiagArgValue::Str(std::borrow::Cow::Owned(instance))
})
}
compiler/rustc_middle/src/ty/error.rs
+7 -7
View File
@@ -12,7 +12,7 @@ use rustc_macros::extension;
pub use rustc_type_ir::error::ExpectedFound;
use crate::ty::print::{FmtPrinter, Print, with_forced_trimmed_paths};
use crate::ty::{self, Lift, Ty, TyCtxt};
use crate::ty::{self, Ty, TyCtxt};
pub type TypeError<'tcx> = rustc_type_ir::error::TypeError<TyCtxt<'tcx>>;
@@ -220,10 +220,10 @@ impl<'tcx> Ty<'tcx> {
impl<'tcx> TyCtxt<'tcx> {
pub fn string_with_limit<T>(self, t: T, length_limit: usize, ns: hir::def::Namespace) -> String
where
T: Copy + for<'a, 'b> Lift<TyCtxt<'b>, Lifted: Print<'b, FmtPrinter<'a, 'b>>>,
T: Copy + for<'a> Print<FmtPrinter<'a, 'tcx>>,
{
let mut type_limit = 50;
let regular = FmtPrinter::print_string(self, ns, |p| self.lift(t).print(p))
let regular = FmtPrinter::print_string(self, ns, |p| t.print(p))
.expect("could not write to `String`");
if regular.len() <= length_limit {
return regular;
@@ -233,7 +233,7 @@ impl<'tcx> TyCtxt<'tcx> {
// Look for the longest properly trimmed path that still fits in length_limit.
short = with_forced_trimmed_paths!({
let mut p = FmtPrinter::new_with_limit(self, ns, Limit(type_limit));
self.lift(t).print(&mut p).expect("could not print type");
t.print(&mut p).expect("could not print type");
p.into_buffer()
});
if short.len() <= length_limit || type_limit == 0 {
@@ -250,7 +250,7 @@ impl<'tcx> TyCtxt<'tcx> {
/// where we wrote the file to is only printed once. The path will use the type namespace.
pub fn short_string<T>(self, t: T, path: &mut Option<PathBuf>) -> String
where
T: Copy + Hash + for<'a, 'b> Lift<TyCtxt<'b>, Lifted: Print<'b, FmtPrinter<'a, 'b>>>,
T: Copy + Hash + for<'a> Print<FmtPrinter<'a, 'tcx>>,
{
self.short_string_namespace(t, path, hir::def::Namespace::TypeNS)
}
@@ -266,9 +266,9 @@ impl<'tcx> TyCtxt<'tcx> {
namespace: hir::def::Namespace,
) -> String
where
T: Copy + Hash + for<'a, 'b> Lift<TyCtxt<'b>, Lifted: Print<'b, FmtPrinter<'a, 'b>>>,
T: Copy + Hash + for<'a> Print<FmtPrinter<'a, 'tcx>>,
{
let regular = FmtPrinter::print_string(self, namespace, |p| self.lift(t).print(p))
let regular = FmtPrinter::print_string(self, namespace, |p| t.print(p))
.expect("could not write to `String`");
if !self.sess.opts.unstable_opts.write_long_types_to_disk || self.sess.opts.verbose {
compiler/rustc_middle/src/ty/predicate.rs
+2 -2
View File
@@ -113,7 +113,7 @@ impl<'tcx> Predicate<'tcx> {
impl<'tcx> rustc_errors::IntoDiagArg for Predicate<'tcx> {
fn into_diag_arg(self, path: &mut Option<std::path::PathBuf>) -> rustc_errors::DiagArgValue {
ty::tls::with(|tcx| {
let pred = tcx.short_string(self, path);
let pred = tcx.short_string(tcx.lift(self), path);
rustc_errors::DiagArgValue::Str(std::borrow::Cow::Owned(pred))
})
}
@@ -122,7 +122,7 @@ impl<'tcx> rustc_errors::IntoDiagArg for Predicate<'tcx> {
impl<'tcx> rustc_errors::IntoDiagArg for Clause<'tcx> {
fn into_diag_arg(self, path: &mut Option<std::path::PathBuf>) -> rustc_errors::DiagArgValue {
ty::tls::with(|tcx| {
let clause = tcx.short_string(self, path);
let clause = tcx.short_string(tcx.lift(self), path);
rustc_errors::DiagArgValue::Str(std::borrow::Cow::Owned(clause))
})
}
compiler/rustc_middle/src/ty/print/mod.rs
+7 -7
View File
@@ -15,7 +15,7 @@ use super::Lift;
pub type PrintError = std::fmt::Error;
pub trait Print<'tcx, P> {
pub trait Print<P> {
fn print(&self, p: &mut P) -> Result<(), PrintError>;
}
@@ -350,19 +350,19 @@ pub fn characteristic_def_id_of_type(ty: Ty<'_>) -> Option<DefId> {
characteristic_def_id_of_type_cached(ty, &mut SsoHashSet::new())
}
impl<'tcx, P: Printer<'tcx>> Print<'tcx, P> for ty::Region<'tcx> {
impl<'tcx, P: Printer<'tcx>> Print<P> for ty::Region<'tcx> {
fn print(&self, p: &mut P) -> Result<(), PrintError> {
p.print_region(*self)
}
}
impl<'tcx, P: Printer<'tcx>> Print<'tcx, P> for Ty<'tcx> {
impl<'tcx, P: Printer<'tcx>> Print<P> for Ty<'tcx> {
fn print(&self, p: &mut P) -> Result<(), PrintError> {
p.print_type(*self)
}
}
impl<'tcx, P: Printer<'tcx> + std::fmt::Write> Print<'tcx, P> for ty::Instance<'tcx> {
impl<'tcx, P: Printer<'tcx> + std::fmt::Write> Print<P> for ty::Instance<'tcx> {
fn print(&self, cx: &mut P) -> Result<(), PrintError> {
cx.print_def_path(self.def_id(), self.args)?;
match self.def {
@@ -399,13 +399,13 @@ impl<'tcx, P: Printer<'tcx> + std::fmt::Write> Print<'tcx, P> for ty::Instance<'
}
}
impl<'tcx, P: Printer<'tcx>> Print<'tcx, P> for &'tcx ty::List<ty::PolyExistentialPredicate<'tcx>> {
impl<'tcx, P: Printer<'tcx>> Print<P> for &'tcx ty::List<ty::PolyExistentialPredicate<'tcx>> {
fn print(&self, p: &mut P) -> Result<(), PrintError> {
p.print_dyn_existential(self)
}
}
impl<'tcx, P: Printer<'tcx>> Print<'tcx, P> for ty::Const<'tcx> {
impl<'tcx, P: Printer<'tcx>> Print<P> for ty::Const<'tcx> {
fn print(&self, p: &mut P) -> Result<(), PrintError> {
p.print_const(*self)
}
@@ -413,7 +413,7 @@ impl<'tcx, P: Printer<'tcx>> Print<'tcx, P> for ty::Const<'tcx> {
impl<T> rustc_type_ir::ir_print::IrPrint<T> for TyCtxt<'_>
where
T: Copy + for<'a, 'tcx> Lift<TyCtxt<'tcx>, Lifted: Print<'tcx, FmtPrinter<'a, 'tcx>>>,
T: Copy + for<'a, 'tcx> Lift<TyCtxt<'tcx>, Lifted: Print<FmtPrinter<'a, 'tcx>>>,
{
fn print(t: &T, fmt: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
ty::tls::with(|tcx| {
compiler/rustc_middle/src/ty/print/pretty.rs
+10 -10
View File
@@ -265,7 +265,7 @@ pub trait PrettyPrinter<'tcx>: Printer<'tcx> + fmt::Write {
fn pretty_print_in_binder<T>(&mut self, value: &ty::Binder<'tcx, T>) -> Result<(), PrintError>
where
T: Print<'tcx, Self> + TypeFoldable<TyCtxt<'tcx>>,
T: Print<Self> + TypeFoldable<TyCtxt<'tcx>>,
{
value.as_ref().skip_binder().print(self)
}
@@ -285,7 +285,7 @@ pub trait PrettyPrinter<'tcx>: Printer<'tcx> + fmt::Write {
/// Prints comma-separated elements.
fn comma_sep<T>(&mut self, mut elems: impl Iterator<Item = T>) -> Result<(), PrintError>
where
T: Print<'tcx, Self>,
T: Print<Self>,
{
if let Some(first) = elems.next() {
first.print(self)?;
@@ -2484,7 +2484,7 @@ impl<'tcx> PrettyPrinter<'tcx> for FmtPrinter<'_, 'tcx> {
fn pretty_print_in_binder<T>(&mut self, value: &ty::Binder<'tcx, T>) -> Result<(), PrintError>
where
T: Print<'tcx, Self> + TypeFoldable<TyCtxt<'tcx>>,
T: Print<Self> + TypeFoldable<TyCtxt<'tcx>>,
{
self.wrap_binder(value, WrapBinderMode::ForAll, |new_value, this| new_value.print(this))
}
@@ -2940,18 +2940,18 @@ impl<'tcx> FmtPrinter<'_, 'tcx> {
}
}
impl<'tcx, T, P: PrettyPrinter<'tcx>> Print<'tcx, P> for ty::Binder<'tcx, T>
impl<'tcx, T, P: PrettyPrinter<'tcx>> Print<P> for ty::Binder<'tcx, T>
where
T: Print<'tcx, P> + TypeFoldable<TyCtxt<'tcx>>,
T: Print<P> + TypeFoldable<TyCtxt<'tcx>>,
{
fn print(&self, p: &mut P) -> Result<(), PrintError> {
p.pretty_print_in_binder(self)
}
}
impl<'tcx, T, P: PrettyPrinter<'tcx>> Print<'tcx, P> for ty::OutlivesPredicate<'tcx, T>
impl<'tcx, T, P: PrettyPrinter<'tcx>> Print<P> for ty::OutlivesPredicate<'tcx, T>
where
T: Print<'tcx, P>,
T: Print<P>,
{
fn print(&self, p: &mut P) -> Result<(), PrintError> {
self.0.print(p)?;
@@ -2970,7 +2970,7 @@ pub struct TraitRefPrintOnlyTraitPath<'tcx>(ty::TraitRef<'tcx>);
impl<'tcx> rustc_errors::IntoDiagArg for TraitRefPrintOnlyTraitPath<'tcx> {
fn into_diag_arg(self, path: &mut Option<std::path::PathBuf>) -> rustc_errors::DiagArgValue {
ty::tls::with(|tcx| {
let trait_ref = tcx.short_string(self, path);
let trait_ref = tcx.short_string(tcx.lift(self), path);
rustc_errors::DiagArgValue::Str(std::borrow::Cow::Owned(trait_ref))
})
}
@@ -2990,7 +2990,7 @@ pub struct TraitRefPrintSugared<'tcx>(ty::TraitRef<'tcx>);
impl<'tcx> rustc_errors::IntoDiagArg for TraitRefPrintSugared<'tcx> {
fn into_diag_arg(self, path: &mut Option<std::path::PathBuf>) -> rustc_errors::DiagArgValue {
ty::tls::with(|tcx| {
let trait_ref = tcx.short_string(self, path);
let trait_ref = tcx.short_string(tcx.lift(self), path);
rustc_errors::DiagArgValue::Str(std::borrow::Cow::Owned(trait_ref))
})
}
@@ -3108,7 +3108,7 @@ macro_rules! forward_display_to_print {
macro_rules! define_print {
(($self:ident, $p:ident): $($ty:ty $print:block)+) => {
$(impl<'tcx, P: PrettyPrinter<'tcx>> Print<'tcx, P> for $ty {
$(impl<'tcx, P: PrettyPrinter<'tcx>> Print<P> for $ty {
fn print(&$self, $p: &mut P) -> Result<(), PrintError> {
let _: () = $print;
Ok(())
compiler/rustc_symbol_mangling/src/legacy.rs
+1 -1
View File
@@ -480,7 +480,7 @@ impl<'tcx> PrettyPrinter<'tcx> for LegacySymbolMangler<'tcx> {
// Identical to `PrettyPrinter::comma_sep` except there is no space after each comma.
fn comma_sep<T>(&mut self, mut elems: impl Iterator<Item = T>) -> Result<(), PrintError>
where
T: Print<'tcx, Self>,
T: Print<Self>,
{
if let Some(first) = elems.next() {
first.print(self)?;
compiler/rustc_trait_selection/src/error_reporting/infer/nice_region_error/placeholder_error.rs
+2 -2
View File
@@ -28,7 +28,7 @@ pub(crate) struct Highlighted<'tcx, T> {
impl<'tcx, T> IntoDiagArg for Highlighted<'tcx, T>
where
T: for<'a> Print<'tcx, FmtPrinter<'a, 'tcx>>,
T: for<'a> Print<FmtPrinter<'a, 'tcx>>,
{
fn into_diag_arg(self, _: &mut Option<std::path::PathBuf>) -> rustc_errors::DiagArgValue {
rustc_errors::DiagArgValue::Str(self.to_string().into())
@@ -43,7 +43,7 @@ impl<'tcx, T> Highlighted<'tcx, T> {
impl<'tcx, T> fmt::Display for Highlighted<'tcx, T>
where
T: for<'a> Print<'tcx, FmtPrinter<'a, 'tcx>>,
T: for<'a> Print<FmtPrinter<'a, 'tcx>>,
{
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
let mut p = ty::print::FmtPrinter::new(self.tcx, self.ns);
compiler/rustc_trait_selection/src/error_reporting/traits/overflow.rs
+1 -1
View File
@@ -60,7 +60,7 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
) -> Diag<'a> {
fn with_short_path<'tcx, T>(tcx: TyCtxt<'tcx>, value: T) -> String
where
T: fmt::Display + Print<'tcx, FmtPrinter<'tcx, 'tcx>>,
T: fmt::Display + for<'b> Print<FmtPrinter<'b, 'tcx>>,
{
let s = value.to_string();
if s.len() > 50 {