From 8449a2b7599a7f767394ce97d674fc175454b4a0 Mon Sep 17 00:00:00 2001
From: Mike Gerwitz <mike.gerwitz@ryansg.com>
Date: Wed, 28 Jun 2023 11:34:33 -0400
Subject: [PATCH] tamer: parse::prelude: Include Display, Debug, and
 Error-related exports

Cut down on the import boilerplate some more for `ParseState`s.

DEV-13163
---
 tamer/src/asg/air/expr.rs   | 1 -
 tamer/src/asg/air/meta.rs   | 5 +----
 tamer/src/asg/air/opaque.rs | 1 -
 tamer/src/asg/air/pkg.rs    | 2 +-
 tamer/src/asg/air/tpl.rs    | 7 +------
 tamer/src/nir/air.rs        | 4 +---
 tamer/src/nir/tplshort.rs   | 2 +-
 tamer/src/parse.rs          | 9 +++++++--
 tamer/src/xir/autoclose.rs  | 1 -
 tamer/src/xir/flat.rs       | 7 +------
 10 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/tamer/src/asg/air/expr.rs b/tamer/src/asg/air/expr.rs
index eda4aedd..7aad237e 100644
--- a/tamer/src/asg/air/expr.rs
+++ b/tamer/src/asg/air/expr.rs
@@ -34,7 +34,6 @@ use crate::{
         graph::object::{ObjectIndexRelTo, ObjectIndexTo},
         ObjectKind,
     },
-    diagnose::Annotate,
     f::Functor,
     parse::prelude::*,
 };
diff --git a/tamer/src/asg/air/meta.rs b/tamer/src/asg/air/meta.rs
index 35ab8c8f..30f4c234 100644
--- a/tamer/src/asg/air/meta.rs
+++ b/tamer/src/asg/air/meta.rs
@@ -26,10 +26,7 @@ use super::{
     ir::AirBindableMeta,
     AirAggregate, AirAggregateCtx,
 };
-use crate::{
-    asg::graph::object::Meta, diagnose::Annotate, diagnostic_todo,
-    parse::prelude::*,
-};
+use crate::{asg::graph::object::Meta, diagnostic_todo, parse::prelude::*};
 
 /// Metasyntactic variable (metavariable) parser.
 #[derive(Debug, PartialEq)]
diff --git a/tamer/src/asg/air/opaque.rs b/tamer/src/asg/air/opaque.rs
index bc3f4914..2b5c7917 100644
--- a/tamer/src/asg/air/opaque.rs
+++ b/tamer/src/asg/air/opaque.rs
@@ -26,7 +26,6 @@
 
 use super::{super::AsgError, ir::AirIdent, AirAggregate, AirAggregateCtx};
 use crate::parse::prelude::*;
-use std::fmt::Display;
 
 #[derive(Debug, PartialEq)]
 pub enum AirOpaqueAggregate {
diff --git a/tamer/src/asg/air/pkg.rs b/tamer/src/asg/air/pkg.rs
index dbc3ebce..e68d1545 100644
--- a/tamer/src/asg/air/pkg.rs
+++ b/tamer/src/asg/air/pkg.rs
@@ -26,7 +26,7 @@ use super::{
     ir::AirLiteratePkg,
     AirAggregate, AirAggregateCtx,
 };
-use crate::{diagnose::Annotate, diagnostic_todo, parse::prelude::*};
+use crate::{diagnostic_todo, parse::prelude::*};
 
 /// Package parsing with support for loaded identifiers.
 ///
diff --git a/tamer/src/asg/air/tpl.rs b/tamer/src/asg/air/tpl.rs
index 7b3d50cd..2aa3fadd 100644
--- a/tamer/src/asg/air/tpl.rs
+++ b/tamer/src/asg/air/tpl.rs
@@ -26,12 +26,7 @@ use super::{
     ir::AirBindableTpl,
     AirAggregate, AirAggregateCtx,
 };
-use crate::{
-    diagnose::Annotate,
-    fmt::{DisplayWrapper, TtQuote},
-    parse::prelude::*,
-    span::Span,
-};
+use crate::{fmt::TtQuote, parse::prelude::*, span::Span};
 
 /// Template parser and token aggregator.
 ///
diff --git a/tamer/src/nir/air.rs b/tamer/src/nir/air.rs
index 5b2e49a9..082e97f9 100644
--- a/tamer/src/nir/air.rs
+++ b/tamer/src/nir/air.rs
@@ -22,15 +22,13 @@
 use super::Nir;
 use crate::{
     asg::{air::Air, ExprOp},
-    diagnose::{Annotate, Diagnostic},
-    fmt::{DisplayWrapper, TtQuote},
+    fmt::TtQuote,
     nir::{Nir::*, NirEntity::*},
     parse::prelude::*,
     span::Span,
     sym::{st::raw::U_TRUE, SymbolId},
 };
 use arrayvec::ArrayVec;
-use std::{error::Error, fmt::Display};
 
 /// Dynamic [`NirToAir`] parser configuration.
 ///
diff --git a/tamer/src/nir/tplshort.rs b/tamer/src/nir/tplshort.rs
index 6145ed60..033639a9 100644
--- a/tamer/src/nir/tplshort.rs
+++ b/tamer/src/nir/tplshort.rs
@@ -80,7 +80,7 @@ use arrayvec::ArrayVec;
 
 use super::{Nir, NirEntity};
 use crate::{
-    fmt::{DisplayWrapper, TtQuote},
+    fmt::TtQuote,
     parse::prelude::*,
     span::Span,
     sym::{
diff --git a/tamer/src/parse.rs b/tamer/src/parse.rs
index 07202025..a7a9e252 100644
--- a/tamer/src/parse.rs
+++ b/tamer/src/parse.rs
@@ -58,8 +58,13 @@ pub mod prelude {
         TransitionResult, Transitionable,
     };
 
-    // Every `Token` must implement `Display`.
-    pub use std::fmt::Display;
+    // Every `Token`.
+    pub use crate::fmt::DisplayWrapper;
+    pub use std::fmt::{Debug, Display};
+
+    // Every `ParseState::Error`.
+    pub use crate::diagnose::{Annotate, AnnotatedSpan, Diagnostic};
+    pub use std::error::Error;
 }
 
 /// A single datum from a streaming IR with an associated [`Span`].
diff --git a/tamer/src/xir/autoclose.rs b/tamer/src/xir/autoclose.rs
index d17c9d98..f08dc6c8 100644
--- a/tamer/src/xir/autoclose.rs
+++ b/tamer/src/xir/autoclose.rs
@@ -106,7 +106,6 @@ use crate::{
     span::{Span, UNKNOWN_SPAN},
     xir::EleSpan,
 };
-use std::fmt::Display;
 
 use XirfAutoClose::*;
 
diff --git a/tamer/src/xir/flat.rs b/tamer/src/xir/flat.rs
index 57484fcd..ec01f04f 100644
--- a/tamer/src/xir/flat.rs
+++ b/tamer/src/xir/flat.rs
@@ -46,7 +46,6 @@ use super::{
     CloseSpan, OpenSpan, QName, Token as XirToken, TokenStream,
 };
 use crate::{
-    diagnose::{Annotate, AnnotatedSpan, Diagnostic},
     f::Functor,
     parse::prelude::*,
     span::Span,
@@ -54,11 +53,7 @@ use crate::{
     xir::EleSpan,
 };
 use arrayvec::ArrayVec;
-use std::{
-    error::Error,
-    fmt::{Debug, Display},
-    marker::PhantomData,
-};
+use std::marker::PhantomData;
 
 // Used for organization.
 pub use accept::*;