Skip to content

Commit 84460f9

Browse files
NoratriebNoratrieb
committed
Remove Print::Error
All printing goes through `fmt::Error` now.
1 parent c464658 commit 84460f9

File tree

6 files changed

+17
-32
lines changed

6 files changed

+17
-32
lines changed

‎compiler/rustc_const_eval/src/util/type_name.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ impl<'tcx> PrettyPrinter<'tcx> for AbsolutePathPrinter<'tcx> {
138138
}
139139
fn comma_sep<T>(mut self, mut elems: impl Iterator<Item = T>) -> Result<Self, PrintError>
140140
where
141-
T: Print<'tcx, Self, Error = PrintError>,
141+
T: Print<'tcx, Self>,
142142
{
143143
if let Some(first) = elems.next() {
144144
self = first.print(self)?;

‎compiler/rustc_infer/src/infer/error_reporting/nice_region_error/placeholder_error.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ pub struct Highlighted<'tcx, T> {
2828

2929
impl<'tcx, T> IntoDiagnosticArg for Highlighted<'tcx, T>
3030
where
31-
T: for<'a> Print<'tcx, FmtPrinter<'a, 'tcx>, Error = fmt::Error>,
31+
T: for<'a> Print<'tcx, FmtPrinter<'a, 'tcx>>,
3232
{
3333
fn into_diagnostic_arg(self) -> rustc_errors::DiagnosticArgValue<'static> {
3434
rustc_errors::DiagnosticArgValue::Str(self.to_string().into())
@@ -43,7 +43,7 @@ impl<'tcx, T> Highlighted<'tcx, T> {
4343

4444
impl<'tcx, T> fmt::Display for Highlighted<'tcx, T>
4545
where
46-
T: for<'a> Print<'tcx, FmtPrinter<'a, 'tcx>, Error = fmt::Error>,
46+
T: for<'a> Print<'tcx, FmtPrinter<'a, 'tcx>>,
4747
{
4848
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
4949
let mut printer = ty::print::FmtPrinter::new(self.tcx, Namespace::TypeNS);

‎compiler/rustc_middle/src/ty/print/mod.rs

-7
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ pub type PrintError = std::fmt::Error;
1515
// FIXME(eddyb) false positive, the lifetime parameters are used with `P: Printer<...>`.
1616
#[allow(unused_lifetimes)]
1717
pub trait Print<'tcx, P> {
18-
type Error;
19-
2018
fn print(&self, cx: P) -> Result<P, PrintError>;
2119
}
2220

@@ -288,29 +286,24 @@ pub fn characteristic_def_id_of_type(ty: Ty<'_>) -> Option<DefId> {
288286
}
289287

290288
impl<'tcx, P: Printer<'tcx>> Print<'tcx, P> for ty::Region<'tcx> {
291-
type Error = PrintError;
292289
fn print(&self, cx: P) -> Result<P, PrintError> {
293290
cx.print_region(*self)
294291
}
295292
}
296293

297294
impl<'tcx, P: Printer<'tcx>> Print<'tcx, P> for Ty<'tcx> {
298-
type Error = PrintError;
299-
300295
fn print(&self, cx: P) -> Result<P, PrintError> {
301296
cx.print_type(*self)
302297
}
303298
}
304299

305300
impl<'tcx, P: Printer<'tcx>> Print<'tcx, P> for &'tcx ty::List<ty::PolyExistentialPredicate<'tcx>> {
306-
type Error = PrintError;
307301
fn print(&self, cx: P) -> Result<P, PrintError> {
308302
cx.print_dyn_existential(self)
309303
}
310304
}
311305

312306
impl<'tcx, P: Printer<'tcx>> Print<'tcx, P> for ty::Const<'tcx> {
313-
type Error = PrintError;
314307
fn print(&self, cx: P) -> Result<P, PrintError> {
315308
cx.print_const(*self)
316309
}

‎compiler/rustc_middle/src/ty/print/pretty.rs

+11-15
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ pub trait PrettyPrinter<'tcx>: Printer<'tcx> + fmt::Write {
217217

218218
fn in_binder<T>(self, value: &ty::Binder<'tcx, T>) -> Result<Self, PrintError>
219219
where
220-
T: Print<'tcx, Self, Error = PrintError> + TypeFoldable<TyCtxt<'tcx>>,
220+
T: Print<'tcx, Self> + TypeFoldable<TyCtxt<'tcx>>,
221221
{
222222
value.as_ref().skip_binder().print(self)
223223
}
@@ -228,15 +228,15 @@ pub trait PrettyPrinter<'tcx>: Printer<'tcx> + fmt::Write {
228228
f: F,
229229
) -> Result<Self, PrintError>
230230
where
231-
T: Print<'tcx, Self, Error = PrintError> + TypeFoldable<TyCtxt<'tcx>>,
231+
T: Print<'tcx, Self> + TypeFoldable<TyCtxt<'tcx>>,
232232
{
233233
f(value.as_ref().skip_binder(), self)
234234
}
235235

236236
/// Prints comma-separated elements.
237237
fn comma_sep<T>(mut self, mut elems: impl Iterator<Item = T>) -> Result<Self, PrintError>
238238
where
239-
T: Print<'tcx, Self, Error = PrintError>,
239+
T: Print<'tcx, Self>,
240240
{
241241
if let Some(first) = elems.next() {
242242
self = first.print(self)?;
@@ -2083,7 +2083,7 @@ impl<'tcx> PrettyPrinter<'tcx> for FmtPrinter<'_, 'tcx> {
20832083

20842084
fn in_binder<T>(self, value: &ty::Binder<'tcx, T>) -> Result<Self, PrintError>
20852085
where
2086-
T: Print<'tcx, Self, Error = PrintError> + TypeFoldable<TyCtxt<'tcx>>,
2086+
T: Print<'tcx, Self> + TypeFoldable<TyCtxt<'tcx>>,
20872087
{
20882088
self.pretty_in_binder(value)
20892089
}
@@ -2094,7 +2094,7 @@ impl<'tcx> PrettyPrinter<'tcx> for FmtPrinter<'_, 'tcx> {
20942094
f: C,
20952095
) -> Result<Self, PrintError>
20962096
where
2097-
T: Print<'tcx, Self, Error = PrintError> + TypeFoldable<TyCtxt<'tcx>>,
2097+
T: Print<'tcx, Self> + TypeFoldable<TyCtxt<'tcx>>,
20982098
{
20992099
self.pretty_wrap_binder(value, f)
21002100
}
@@ -2343,7 +2343,7 @@ impl<'tcx> FmtPrinter<'_, 'tcx> {
23432343
value: &ty::Binder<'tcx, T>,
23442344
) -> Result<(Self, T, BTreeMap<ty::BoundRegion, ty::Region<'tcx>>), fmt::Error>
23452345
where
2346-
T: Print<'tcx, Self, Error = fmt::Error> + TypeFoldable<TyCtxt<'tcx>>,
2346+
T: Print<'tcx, Self> + TypeFoldable<TyCtxt<'tcx>>,
23472347
{
23482348
fn name_by_region_index(
23492349
index: usize,
@@ -2513,7 +2513,7 @@ impl<'tcx> FmtPrinter<'_, 'tcx> {
25132513

25142514
pub fn pretty_in_binder<T>(self, value: &ty::Binder<'tcx, T>) -> Result<Self, fmt::Error>
25152515
where
2516-
T: Print<'tcx, Self, Error = fmt::Error> + TypeFoldable<TyCtxt<'tcx>>,
2516+
T: Print<'tcx, Self> + TypeFoldable<TyCtxt<'tcx>>,
25172517
{
25182518
let old_region_index = self.region_index;
25192519
let (new, new_value, _) = self.name_all_regions(value)?;
@@ -2529,7 +2529,7 @@ impl<'tcx> FmtPrinter<'_, 'tcx> {
25292529
f: C,
25302530
) -> Result<Self, fmt::Error>
25312531
where
2532-
T: Print<'tcx, Self, Error = fmt::Error> + TypeFoldable<TyCtxt<'tcx>>,
2532+
T: Print<'tcx, Self> + TypeFoldable<TyCtxt<'tcx>>,
25332533
{
25342534
let old_region_index = self.region_index;
25352535
let (new, new_value, _) = self.name_all_regions(value)?;
@@ -2594,21 +2594,18 @@ impl<'tcx> FmtPrinter<'_, 'tcx> {
25942594

25952595
impl<'tcx, T, P: PrettyPrinter<'tcx>> Print<'tcx, P> for ty::Binder<'tcx, T>
25962596
where
2597-
T: Print<'tcx, P, Error = PrintError> + TypeFoldable<TyCtxt<'tcx>>,
2597+
T: Print<'tcx, P> + TypeFoldable<TyCtxt<'tcx>>,
25982598
{
2599-
type Error = PrintError;
2600-
26012599
fn print(&self, cx: P) -> Result<P, PrintError> {
26022600
cx.in_binder(self)
26032601
}
26042602
}
26052603

26062604
impl<'tcx, T, U, P: PrettyPrinter<'tcx>> Print<'tcx, P> for ty::OutlivesPredicate<T, U>
26072605
where
2608-
T: Print<'tcx, P, Error = PrintError>,
2609-
U: Print<'tcx, P, Error = PrintError>,
2606+
T: Print<'tcx, P>,
2607+
U: Print<'tcx, P>,
26102608
{
2611-
type Error = PrintError;
26122609
fn print(&self, mut cx: P) -> Result<P, PrintError> {
26132610
define_scoped_cx!(cx);
26142611
p!(print(self.0), ": ", print(self.1));
@@ -2636,7 +2633,6 @@ macro_rules! forward_display_to_print {
26362633
macro_rules! define_print_and_forward_display {
26372634
(($self:ident, $cx:ident): $($ty:ty $print:block)+) => {
26382635
$(impl<'tcx, P: PrettyPrinter<'tcx>> Print<'tcx, P> for $ty {
2639-
type Error = fmt::Error;
26402636
fn print(&$self, $cx: P) -> Result<P, PrintError> {
26412637
#[allow(unused_mut)]
26422638
let mut $cx = $cx;

‎compiler/rustc_symbol_mangling/src/legacy.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ impl<'tcx> PrettyPrinter<'tcx> for &mut SymbolPrinter<'tcx> {
365365
}
366366
fn comma_sep<T>(mut self, mut elems: impl Iterator<Item = T>) -> Result<Self, PrintError>
367367
where
368-
T: Print<'tcx, Self, Error = PrintError>,
368+
T: Print<'tcx, Self>,
369369
{
370370
if let Some(first) = elems.next() {
371371
self = first.print(self)?;

‎compiler/rustc_trait_selection/src/traits/error_reporting/type_err_ctxt_ext.rs

+2-6
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,7 @@ pub trait TypeErrCtxtExt<'tcx> {
6060
suggest_increasing_limit: bool,
6161
) -> DiagnosticBuilder<'tcx, ErrorGuaranteed>
6262
where
63-
T: fmt::Display + TypeFoldable<TyCtxt<'tcx>> + Print<'tcx, FmtPrinter<'tcx, 'tcx>>,
64-
<T as Print<'tcx, FmtPrinter<'tcx, 'tcx>>>::Error: std::fmt::Debug;
63+
T: fmt::Display + TypeFoldable<TyCtxt<'tcx>> + Print<'tcx, FmtPrinter<'tcx, 'tcx>>;
6564

6665
fn report_overflow_error<T>(
6766
&self,
@@ -71,8 +70,7 @@ pub trait TypeErrCtxtExt<'tcx> {
7170
mutate: impl FnOnce(&mut Diagnostic),
7271
) -> !
7372
where
74-
T: fmt::Display + TypeFoldable<TyCtxt<'tcx>> + Print<'tcx, FmtPrinter<'tcx, 'tcx>>,
75-
<T as Print<'tcx, FmtPrinter<'tcx, 'tcx>>>::Error: std::fmt::Debug;
73+
T: fmt::Display + TypeFoldable<TyCtxt<'tcx>> + Print<'tcx, FmtPrinter<'tcx, 'tcx>>;
7674

7775
fn report_overflow_no_abort(&self, obligation: PredicateObligation<'tcx>) -> ErrorGuaranteed;
7876

@@ -224,7 +222,6 @@ impl<'tcx> TypeErrCtxtExt<'tcx> for TypeErrCtxt<'_, 'tcx> {
224222
) -> !
225223
where
226224
T: fmt::Display + TypeFoldable<TyCtxt<'tcx>> + Print<'tcx, FmtPrinter<'tcx, 'tcx>>,
227-
<T as Print<'tcx, FmtPrinter<'tcx, 'tcx>>>::Error: std::fmt::Debug,
228225
{
229226
let mut err = self.build_overflow_error(predicate, span, suggest_increasing_limit);
230227
mutate(&mut err);
@@ -242,7 +239,6 @@ impl<'tcx> TypeErrCtxtExt<'tcx> for TypeErrCtxt<'_, 'tcx> {
242239
) -> DiagnosticBuilder<'tcx, ErrorGuaranteed>
243240
where
244241
T: fmt::Display + TypeFoldable<TyCtxt<'tcx>> + Print<'tcx, FmtPrinter<'tcx, 'tcx>>,
245-
<T as Print<'tcx, FmtPrinter<'tcx, 'tcx>>>::Error: std::fmt::Debug,
246242
{
247243
let predicate = self.resolve_vars_if_possible(predicate.clone());
248244
let mut pred_str = predicate.to_string();

0 commit comments

Comments
 (0)