From 5f3841ca2fe5cf0ba714db42a29a8004a878b6e6 Mon Sep 17 00:00:00 2001 From: Eduard-Mihai Burtescu Date: Fri, 7 Dec 2018 16:17:44 +0200 Subject: [PATCH] rustc: rename PrintContext to PrintCx. --- src/librustc/infer/error_reporting/mod.rs | 2 +- src/librustc/ty/print.rs | 18 +++++++++--------- src/librustc/util/ppaux.rs | 14 +++++++------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/librustc/infer/error_reporting/mod.rs b/src/librustc/infer/error_reporting/mod.rs index c7936534aad..ebed768fa54 100644 --- a/src/librustc/infer/error_reporting/mod.rs +++ b/src/librustc/infer/error_reporting/mod.rs @@ -683,7 +683,7 @@ fn push_comma( } /// For generic types with parameters with defaults, remove the parameters corresponding to - /// the defaults. This repeats a lot of the logic found in `PrintContext::parameterized`. + /// the defaults. This repeats a lot of the logic found in `PrintCx::parameterized`. fn strip_generic_default_params( &self, def_id: DefId, diff --git a/src/librustc/ty/print.rs b/src/librustc/ty/print.rs index 5f46806e159..3d6dec8a141 100644 --- a/src/librustc/ty/print.rs +++ b/src/librustc/ty/print.rs @@ -22,7 +22,7 @@ fn visit_region(&mut self, r: ty::Region<'tcx>) -> bool { } #[derive(Debug)] -pub struct PrintContext { +pub struct PrintCx { pub(crate) is_debug: bool, pub(crate) is_verbose: bool, pub(crate) identify_regions: bool, @@ -31,12 +31,12 @@ pub struct PrintContext { pub(crate) binder_depth: usize, } -impl PrintContext { +impl PrintCx { pub(crate) fn new() -> Self { ty::tls::with(|tcx| { let (is_verbose, identify_regions) = (tcx.sess.verbose(), tcx.sess.opts.debugging_opts.identify_regions); - PrintContext { + PrintCx { is_debug: false, is_verbose: is_verbose, identify_regions: identify_regions, @@ -57,32 +57,32 @@ pub(crate) fn prepare_late_bound_region_info<'tcx, T>(&mut self, value: &ty::Bin } pub trait Print<'tcx> { - fn print(&self, f: &mut F, cx: &mut PrintContext) -> fmt::Result; - fn print_to_string(&self, cx: &mut PrintContext) -> String { + fn print(&self, f: &mut F, cx: &mut PrintCx) -> fmt::Result; + fn print_to_string(&self, cx: &mut PrintCx) -> String { let mut result = String::new(); let _ = self.print(&mut result, cx); result } - fn print_display(&self, f: &mut F, cx: &mut PrintContext) -> fmt::Result { + fn print_display(&self, f: &mut F, cx: &mut PrintCx) -> fmt::Result { let old_debug = cx.is_debug; cx.is_debug = false; let result = self.print(f, cx); cx.is_debug = old_debug; result } - fn print_display_to_string(&self, cx: &mut PrintContext) -> String { + fn print_display_to_string(&self, cx: &mut PrintCx) -> String { let mut result = String::new(); let _ = self.print_display(&mut result, cx); result } - fn print_debug(&self, f: &mut F, cx: &mut PrintContext) -> fmt::Result { + fn print_debug(&self, f: &mut F, cx: &mut PrintCx) -> fmt::Result { let old_debug = cx.is_debug; cx.is_debug = true; let result = self.print(f, cx); cx.is_debug = old_debug; result } - fn print_debug_to_string(&self, cx: &mut PrintContext) -> String { + fn print_debug_to_string(&self, cx: &mut PrintCx) -> String { let mut result = String::new(); let _ = self.print_debug(&mut result, cx); result diff --git a/src/librustc/util/ppaux.rs b/src/librustc/util/ppaux.rs index 0dc1aea0a96..683e0aa0dab 100644 --- a/src/librustc/util/ppaux.rs +++ b/src/librustc/util/ppaux.rs @@ -9,7 +9,7 @@ use crate::ty::{Closure, Generator, GeneratorWitness, Foreign, Projection, Opaque}; use crate::ty::{Placeholder, UnnormalizedProjection, Dynamic, Int, Uint, Infer}; use crate::ty::{self, Ty, TyCtxt, TypeFoldable, GenericParamCount, GenericParamDefKind, ParamConst}; -use crate::ty::print::{PrintContext, Print}; +use crate::ty::print::{PrintCx, Print}; use crate::mir::interpret::ConstValue; use std::cell::Cell; @@ -182,7 +182,7 @@ pub fn placeholder_highlight(&self, p: ty::PlaceholderRegion) -> Option { macro_rules! gen_display_debug_body { ( $with:path ) => { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { - let mut cx = PrintContext::new(); + let mut cx = PrintCx::new(); $with(self, f, &mut cx) } }; @@ -213,7 +213,7 @@ impl fmt::Debug for $target { macro_rules! gen_print_impl { ( ($($x:tt)+) $target:ty, ($self:ident, $f:ident, $cx:ident) $disp:block $dbg:block ) => { impl<$($x)+> Print<'tcx> for $target { - fn print(&$self, $f: &mut F, $cx: &mut PrintContext) -> fmt::Result { + fn print(&$self, $f: &mut F, $cx: &mut PrintCx) -> fmt::Result { if $cx.is_debug $dbg else $disp } @@ -221,7 +221,7 @@ fn print(&$self, $f: &mut F, $cx: &mut PrintContext) -> fmt::Resu }; ( () $target:ty, ($self:ident, $f:ident, $cx:ident) $disp:block $dbg:block ) => { impl Print<'tcx> for $target { - fn print(&$self, $f: &mut F, $cx: &mut PrintContext) -> fmt::Result { + fn print(&$self, $f: &mut F, $cx: &mut PrintCx) -> fmt::Result { if $cx.is_debug $dbg else $disp } @@ -275,7 +275,7 @@ macro_rules! print { }; } -impl PrintContext { +impl PrintCx { fn fn_sig(&mut self, f: &mut F, inputs: &[Ty<'_>], @@ -618,11 +618,11 @@ pub fn parameterized(f: &mut F, did: DefId, projections: &[ty::ProjectionPredicate<'_>]) -> fmt::Result { - PrintContext::new().parameterized(f, substs, did, projections) + PrintCx::new().parameterized(f, substs, did, projections) } impl<'a, 'tcx, T: Print<'tcx>> Print<'tcx> for &'a T { - fn print(&self, f: &mut F, cx: &mut PrintContext) -> fmt::Result { + fn print(&self, f: &mut F, cx: &mut PrintCx) -> fmt::Result { (*self).print(f, cx) } } -- 2.44.0