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

@@ -34,7 +34,6 @@ use crate::{
         graph::object::{ObjectIndexRelTo, ObjectIndexTo},
         ObjectKind,
     },
-    diagnose::Annotate,
     f::Functor,
     parse::prelude::*,
 };

tamer/src/asg/air/meta.rs

@@ -26,10 +26,7 @@ use super::{
     ir::AirBindableMeta,
     AirAggregate, AirAggregateCtx,
 };
-use crate::{
+use crate::{asg::graph::object::Meta, diagnostic_todo, parse::prelude::*};
-    asg::graph::object::Meta, diagnose::Annotate, diagnostic_todo,
-    parse::prelude::*,
-};
 
 /// Metasyntactic variable (metavariable) parser.
 #[derive(Debug, PartialEq)]

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 {

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.
 ///

tamer/src/asg/air/tpl.rs

@@ -26,12 +26,7 @@ use super::{
     ir::AirBindableTpl,
     AirAggregate, AirAggregateCtx,
 };
-use crate::{
+use crate::{fmt::TtQuote, parse::prelude::*, span::Span};
-    diagnose::Annotate,
-    fmt::{DisplayWrapper, TtQuote},
-    parse::prelude::*,
-    span::Span,
-};
 
 /// Template parser and token aggregator.
 ///

tamer/src/nir/air.rs

@@ -22,15 +22,13 @@
 use super::Nir;
 use crate::{
     asg::{air::Air, ExprOp},
-    diagnose::{Annotate, Diagnostic},
+    fmt::TtQuote,
-    fmt::{DisplayWrapper, 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.
 ///

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::{

tamer/src/parse.rs

@@ -58,8 +58,13 @@ pub mod prelude {
         TransitionResult, Transitionable,
     };
 
-    // Every `Token` must implement `Display`.
+    // Every `Token`.
-    pub use std::fmt::Display;
+    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`].

tamer/src/xir/autoclose.rs

@@ -106,7 +106,6 @@ use crate::{
     span::{Span, UNKNOWN_SPAN},
     xir::EleSpan,
 };
-use std::fmt::Display;
 
 use XirfAutoClose::*;
 

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::{
+use std::marker::PhantomData;
-    error::Error,
-    fmt::{Debug, Display},
-    marker::PhantomData,
-};
 
 // Used for organization.
 pub use accept::*;