From a7363042a16364a6dafdd545f4069dcf04a4197e Mon Sep 17 00:00:00 2001
From: Nadrieril
Date: Tue, 27 Aug 2019 23:18:13 +0200
Subject: Rename SubExpr to Expr, and Expr to RawExpr
For clarity, and consistency with Value
---
dhall_syntax/src/printer.rs | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'dhall_syntax/src/printer.rs')
diff --git a/dhall_syntax/src/printer.rs b/dhall_syntax/src/printer.rs
index 256ea65..276590e 100644
--- a/dhall_syntax/src/printer.rs
+++ b/dhall_syntax/src/printer.rs
@@ -112,7 +112,7 @@ enum PrintPhase {
// Wraps an Expr with a phase, so that phase selsction can be done
// separate from the actual printing
#[derive(Clone)]
-struct PhasedExpr<'a, A>(&'a SubExpr, PrintPhase);
+struct PhasedExpr<'a, A>(&'a Expr, PrintPhase);
impl<'a, A: Display + Clone> Display for PhasedExpr<'a, A> {
fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
@@ -126,7 +126,7 @@ impl<'a, A: Display + Clone> PhasedExpr<'a, A> {
}
}
-impl Expr {
+impl RawExpr {
fn fmt_phase(
&self,
f: &mut fmt::Formatter,
@@ -202,7 +202,7 @@ impl Expr {
}
}
-impl Display for SubExpr {
+impl Display for Expr {
fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
self.as_ref().fmt_phase(f, PrintPhase::Base)
}
--
cgit v1.2.3