pdf-content-stream: Eliminate PdfOperatorBackendError trait

crates/pdf-canvas/src/canvas_clip_ops.rs

@@ -4,6 +4,7 @@ use pdf_graphics::PathFillType;
 use crate::{canvas_backend::CanvasBackend, error::PdfCanvasError, pdf_canvas::PdfCanvas};
 
 impl<B: CanvasBackend> ClippingPathOps for PdfCanvas<'_, B> {
+    type ErrorType = PdfCanvasError;
     fn clip_path_nonzero_winding(&mut self) -> Result<(), Self::ErrorType> {
         let Some(path) = self.current_path.take() else {
             return Err(PdfCanvasError::NoActivePath);

crates/pdf-canvas/src/canvas_color_ops.rs

@@ -4,6 +4,7 @@ use crate::{canvas_backend::CanvasBackend, error::PdfCanvasError, pdf_canvas::Pd
 use pdf_graphics::color::Color;
 
 impl<B: CanvasBackend> ColorOps for PdfCanvas<'_, B> {
+    type ErrorType = PdfCanvasError;
     fn set_stroking_color_space(&mut self, _name: &str) -> Result<(), Self::ErrorType> {
         self.current_state_mut()?.stroke_pattern = None;
         Ok(())

crates/pdf-canvas/src/canvas_external_object_ops.rs

@@ -203,6 +203,7 @@ fn expand_indexed_to_rgb(
 }
 
 impl<B: CanvasBackend> XObjectOps for PdfCanvas<'_, B> {
+    type ErrorType = PdfCanvasError;
     /// Invokes (renders) an XObject by name from the current resource dictionary.
     ///
     /// This method handles two types of XObjects:

crates/pdf-canvas/src/canvas_graphics_state_ops.rs

@@ -10,6 +10,7 @@ use crate::{
 };
 
 impl<B: CanvasBackend> GraphicsStateOps for PdfCanvas<'_, B> {
+    type ErrorType = PdfCanvasError;
     fn save_graphics_state(&mut self) -> Result<(), Self::ErrorType> {
         self.save()
     }

crates/pdf-canvas/src/canvas_marked_content_ops.rs

@@ -1,8 +1,9 @@
 use pdf_content_stream::pdf_operator_backend::MarkedContentOps;
 
-use crate::{canvas_backend::CanvasBackend, pdf_canvas::PdfCanvas};
+use crate::{canvas_backend::CanvasBackend, error::PdfCanvasError, pdf_canvas::PdfCanvas};
 
 impl<B: CanvasBackend> MarkedContentOps for PdfCanvas<'_, B> {
+    type ErrorType = PdfCanvasError;
     fn mark_point(&mut self, _tag: &str) -> Result<(), Self::ErrorType> {
         Ok(())
     }

crates/pdf-canvas/src/canvas_path_ops.rs

@@ -4,6 +4,7 @@ use pdf_graphics::{PaintMode, PathFillType, pdf_path::PdfPath};
 use crate::{canvas_backend::CanvasBackend, error::PdfCanvasError, pdf_canvas::PdfCanvas};
 
 impl<B: CanvasBackend> PathConstructionOps for PdfCanvas<'_, B> {
+    type ErrorType = PdfCanvasError;
     fn move_to(&mut self, x: f32, y: f32) -> Result<(), Self::ErrorType> {
         self.current_path
             .get_or_insert_with(PdfPath::default)
@@ -76,6 +77,7 @@ impl<B: CanvasBackend> PathConstructionOps for PdfCanvas<'_, B> {
 }
 
 impl<B: CanvasBackend> PathPaintingOps for PdfCanvas<'_, B> {
+    type ErrorType = PdfCanvasError;
     fn stroke_path(&mut self) -> Result<(), Self::ErrorType> {
         self.paint_taken_path(PaintMode::Stroke, PathFillType::default())
     }

crates/pdf-canvas/src/canvas_text_ops.rs

@@ -16,6 +16,7 @@ use pdf_graphics::TextRenderingMode;
 use pdf_graphics::transform::Transform;
 
 impl<B: CanvasBackend> TextPositioningOps for PdfCanvas<'_, B> {
+    type ErrorType = PdfCanvasError;
     fn move_text_position(&mut self, tx: f32, ty: f32) -> Result<(), Self::ErrorType> {
         let mat = Transform::from_translate(tx, ty);
         // PDF 1.7 (Tj and text positioning): Td updates Tlm = Tlm * T(tx, ty), then Tm = Tlm.
@@ -62,6 +63,7 @@ impl<B: CanvasBackend> TextPositioningOps for PdfCanvas<'_, B> {
 }
 
 impl<B: CanvasBackend> TextObjectOps for PdfCanvas<'_, B> {
+    type ErrorType = PdfCanvasError;
     fn begin_text_object(&mut self) -> Result<(), Self::ErrorType> {
         self.current_state_mut()?.text_state.matrix = Transform::identity();
         self.current_state_mut()?.text_state.line_matrix = Transform::identity();
@@ -74,6 +76,7 @@ impl<B: CanvasBackend> TextObjectOps for PdfCanvas<'_, B> {
 }
 
 impl<B: CanvasBackend> TextStateOps for PdfCanvas<'_, B> {
+    type ErrorType = PdfCanvasError;
     fn set_character_spacing(&mut self, spacing: f32) -> Result<(), Self::ErrorType> {
         self.current_state_mut()?.text_state.character_spacing = spacing;
         Ok(())
@@ -135,6 +138,7 @@ fn to_char_iter(text: &[u8]) -> impl Iterator<Item = u16> + '_ {
 }
 
 impl<B: CanvasBackend> TextShowingOps for PdfCanvas<'_, B> {
+    type ErrorType = PdfCanvasError;
     fn show_text(&mut self, text: &[u8]) -> Result<(), Self::ErrorType> {
         let current_font = self
             .current_state()?

crates/pdf-canvas/src/lib.rs

@@ -1,7 +1,6 @@
 use canvas_backend::CanvasBackend;
-use error::PdfCanvasError;
 use pdf_canvas::PdfCanvas;
-use pdf_content_stream::pdf_operator_backend::{PdfOperatorBackend, PdfOperatorBackendError};
+use pdf_content_stream::pdf_operator_backend::PdfOperatorBackend;
 
 pub mod canvas_backend;
 mod canvas_clip_ops;
@@ -25,7 +24,3 @@ pub mod type1_font_renderer;
 mod type3_font_renderer;
 
 impl<B: CanvasBackend> PdfOperatorBackend for PdfCanvas<'_, B> {}
-
-impl<B: CanvasBackend> PdfOperatorBackendError for PdfCanvas<'_, B> {
-    type ErrorType = PdfCanvasError;
-}

crates/pdf-canvas/src/shading.rs

@@ -4,6 +4,7 @@ use pdf_graphics::pdf_path::PdfPath;
 use crate::{canvas_backend::CanvasBackend, error::PdfCanvasError, pdf_canvas::PdfCanvas};
 
 impl<B: CanvasBackend> ShadingOps for PdfCanvas<'_, B> {
+    type ErrorType = PdfCanvasError;
     fn paint_shading(&mut self, shading_name: &str) -> Result<(), Self::ErrorType> {
         let state = self.current_state()?;
 

crates/pdf-content-stream/src/clipping_path_operators.rs

@@ -1,7 +1,7 @@
 use crate::{
     error::PdfOperatorError,
     pdf_operator::{Operands, PdfOperator, PdfOperatorVariant},
-    pdf_operator_backend::PdfOperatorBackend,
+    pdf_operator_backend::{BackendError, PdfOperatorBackend},
 };
 
 /// Modifies the current clipping path by intersecting it with the current path, using the non-zero winding number rule to determine the region to clip.
@@ -17,7 +17,7 @@ impl PdfOperator for ClipNonZero {
         Ok(PdfOperatorVariant::ClipNonZero(Self))
     }
 
-    fn call<T: PdfOperatorBackend>(&self, backend: &mut T) -> Result<(), T::ErrorType> {
+    fn call<T: PdfOperatorBackend>(&self, backend: &mut T) -> Result<(), BackendError<T>> {
         backend.clip_path_nonzero_winding()
     }
 }
@@ -35,7 +35,7 @@ impl PdfOperator for ClipEvenOdd {
         Ok(PdfOperatorVariant::ClipEvenOdd(Self))
     }
 
-    fn call<T: PdfOperatorBackend>(&self, backend: &mut T) -> Result<(), T::ErrorType> {
+    fn call<T: PdfOperatorBackend>(&self, backend: &mut T) -> Result<(), BackendError<T>> {
         backend.clip_path_even_odd()
     }
 }

crates/pdf-content-stream/src/color_operators.rs

@@ -1,7 +1,7 @@
 use crate::{
     error::PdfOperatorError,
     pdf_operator::{Operands, PdfOperator, PdfOperatorVariant},
-    pdf_operator_backend::PdfOperatorBackend,
+    pdf_operator_backend::{BackendError, PdfOperatorBackend},
 };
 
 /// Sets the fill color to a grayscale value.
@@ -28,7 +28,7 @@ impl PdfOperator for SetGrayFill {
         Ok(PdfOperatorVariant::SetGrayFill(Self::new(gray)))
     }
 
-    fn call<T: PdfOperatorBackend>(&self, backend: &mut T) -> Result<(), T::ErrorType> {
+    fn call<T: PdfOperatorBackend>(&self, backend: &mut T) -> Result<(), BackendError<T>> {
         backend.set_non_stroking_gray(self.gray)
     }
 }
@@ -57,7 +57,7 @@ impl PdfOperator for SetGrayStroke {
         Ok(PdfOperatorVariant::SetGrayStroke(Self::new(gray)))
     }
 
-    fn call<T: PdfOperatorBackend>(&self, backend: &mut T) -> Result<(), T::ErrorType> {
+    fn call<T: PdfOperatorBackend>(&self, backend: &mut T) -> Result<(), BackendError<T>> {
         backend.set_stroking_gray(self.gray)
     }
 }
@@ -92,7 +92,7 @@ impl PdfOperator for SetRGBFill {
         Ok(PdfOperatorVariant::SetRGBFill(Self::new(r, g, b)))
     }
 
-    fn call<T: PdfOperatorBackend>(&self, backend: &mut T) -> Result<(), T::ErrorType> {
+    fn call<T: PdfOperatorBackend>(&self, backend: &mut T) -> Result<(), BackendError<T>> {
         backend.set_non_stroking_rgb(self.r, self.g, self.b)
     }
 }
@@ -127,7 +127,7 @@ impl PdfOperator for SetRGBStroke {
         Ok(PdfOperatorVariant::SetRGBStroke(Self::new(r, g, b)))
     }
 
-    fn call<T: PdfOperatorBackend>(&self, backend: &mut T) -> Result<(), T::ErrorType> {
+    fn call<T: PdfOperatorBackend>(&self, backend: &mut T) -> Result<(), BackendError<T>> {
         backend.set_stroking_rgb(self.r, self.g, self.b)
     }
 }
@@ -165,7 +165,7 @@ impl PdfOperator for SetCMYKFill {
         Ok(PdfOperatorVariant::SetCMYKFill(Self::new(c, m, y, k)))
     }
 
-    fn call<T: PdfOperatorBackend>(&self, backend: &mut T) -> Result<(), T::ErrorType> {
+    fn call<T: PdfOperatorBackend>(&self, backend: &mut T) -> Result<(), BackendError<T>> {
         backend.set_non_stroking_cmyk(self.c, self.m, self.y, self.k)
     }
 }
@@ -203,7 +203,7 @@ impl PdfOperator for SetCMYKStroke {
         Ok(PdfOperatorVariant::SetCMYKStroke(Self::new(c, m, y, k)))
     }
 
-    fn call<T: PdfOperatorBackend>(&self, backend: &mut T) -> Result<(), T::ErrorType> {
+    fn call<T: PdfOperatorBackend>(&self, backend: &mut T) -> Result<(), BackendError<T>> {
         backend.set_stroking_cmyk(self.c, self.m, self.y, self.k)
     }
 }
@@ -230,7 +230,7 @@ impl PdfOperator for SetStrokeColorSpace {
         Ok(PdfOperatorVariant::SetStrokeColorSpace(Self::new(name)))
     }
 
-    fn call<T: PdfOperatorBackend>(&self, backend: &mut T) -> Result<(), T::ErrorType> {
+    fn call<T: PdfOperatorBackend>(&self, backend: &mut T) -> Result<(), BackendError<T>> {
         backend.set_stroking_color_space(&self.name)
     }
 }
@@ -259,7 +259,7 @@ impl PdfOperator for SetNonStrokingColorSpace {
         )))
     }
 
-    fn call<T: PdfOperatorBackend>(&self, backend: &mut T) -> Result<(), T::ErrorType> {
+    fn call<T: PdfOperatorBackend>(&self, backend: &mut T) -> Result<(), BackendError<T>> {
         backend.set_non_stroking_color_space(&self.name)
     }
 }
@@ -309,7 +309,7 @@ impl PdfOperator for SetStrokingColor {
         )))
     }
 
-    fn call<T: PdfOperatorBackend>(&self, backend: &mut T) -> Result<(), T::ErrorType> {
+    fn call<T: PdfOperatorBackend>(&self, backend: &mut T) -> Result<(), BackendError<T>> {
         if let Some(pattern) = &self.pattern {
             backend.set_stroking_color_extended(&self.components, pattern)
         } else {
@@ -363,7 +363,7 @@ impl PdfOperator for SetNonStrokingColor {
         )))
     }
 
-    fn call<T: PdfOperatorBackend>(&self, backend: &mut T) -> Result<(), T::ErrorType> {
+    fn call<T: PdfOperatorBackend>(&self, backend: &mut T) -> Result<(), BackendError<T>> {
         if let Some(pattern) = &self.pattern {
             backend.set_non_stroking_color_extended(&self.components, pattern)
         } else {

crates/pdf-content-stream/src/compatibility_operators.rs

@@ -1,7 +1,7 @@
 use crate::{
     error::PdfOperatorError,
     pdf_operator::{Operands, PdfOperator, PdfOperatorVariant},
-    pdf_operator_backend::PdfOperatorBackend,
+    pdf_operator_backend::{BackendError, PdfOperatorBackend},
 };
 
 /// Begins a compatibility section (BX).
@@ -24,7 +24,7 @@ impl PdfOperator for BeginCompatibility {
         Ok(PdfOperatorVariant::BeginCompatibility(BeginCompatibility))
     }
 
-    fn call<T: PdfOperatorBackend>(&self, _backend: &mut T) -> Result<(), T::ErrorType> {
+    fn call<T: PdfOperatorBackend>(&self, _backend: &mut T) -> Result<(), BackendError<T>> {
         Ok(())
     }
 }
@@ -42,7 +42,7 @@ impl PdfOperator for EndCompatibility {
         Ok(PdfOperatorVariant::EndCompatibility(EndCompatibility))
     }
 
-    fn call<T: PdfOperatorBackend>(&self, _backend: &mut T) -> Result<(), T::ErrorType> {
+    fn call<T: PdfOperatorBackend>(&self, _backend: &mut T) -> Result<(), BackendError<T>> {
         Ok(())
     }
 }

crates/pdf-content-stream/src/graphics_state_operators.rs

@@ -4,7 +4,7 @@ use pdf_graphics::{LineCap, LineJoin, transform::Transform};
 use crate::{
     error::PdfOperatorError,
     pdf_operator::{Operands, PdfOperator, PdfOperatorVariant},
-    pdf_operator_backend::PdfOperatorBackend,
+    pdf_operator_backend::{BackendError, PdfOperatorBackend},
 };
 
 /// Sets the line width for path stroking.
@@ -30,7 +30,7 @@ impl PdfOperator for SetLineWidth {
         Ok(PdfOperatorVariant::SetLineWidth(Self::new(width)))
     }
 
-    fn call<T: PdfOperatorBackend>(&self, backend: &mut T) -> Result<(), T::ErrorType> {
+    fn call<T: PdfOperatorBackend>(&self, backend: &mut T) -> Result<(), BackendError<T>> {
         backend.set_line_width(self.width)
     }
 }
@@ -64,7 +64,7 @@ impl PdfOperator for SetLineCapStyle {
         Ok(PdfOperatorVariant::SetLineCapStyle(Self::new(style)?))
     }
 
-    fn call<T: PdfOperatorBackend>(&self, backend: &mut T) -> Result<(), T::ErrorType> {
+    fn call<T: PdfOperatorBackend>(&self, backend: &mut T) -> Result<(), BackendError<T>> {
         backend.set_line_cap(self.style)
     }
 }
@@ -98,7 +98,7 @@ impl PdfOperator for SetLineJoinStyle {
         Ok(PdfOperatorVariant::SetLineJoinStyle(Self::new(style)?))
     }
 
-    fn call<T: PdfOperatorBackend>(&self, backend: &mut T) -> Result<(), T::ErrorType> {
+    fn call<T: PdfOperatorBackend>(&self, backend: &mut T) -> Result<(), BackendError<T>> {
         backend.set_line_join(self.style)
     }
 }
@@ -127,7 +127,7 @@ impl PdfOperator for SetMiterLimit {
         Ok(PdfOperatorVariant::SetMiterLimit(Self::new(limit)))
     }
 
-    fn call<T: PdfOperatorBackend>(&self, backend: &mut T) -> Result<(), T::ErrorType> {
+    fn call<T: PdfOperatorBackend>(&self, backend: &mut T) -> Result<(), BackendError<T>> {
         backend.set_miter_limit(self.limit)
     }
 }
@@ -158,7 +158,7 @@ impl PdfOperator for SetDashPattern {
         Ok(PdfOperatorVariant::SetDashPattern(Self::new(array, phase)))
     }
 
-    fn call<T: PdfOperatorBackend>(&self, backend: &mut T) -> Result<(), T::ErrorType> {
+    fn call<T: PdfOperatorBackend>(&self, backend: &mut T) -> Result<(), BackendError<T>> {
         backend.set_dash_pattern(&self.array, self.phase)
     }
 }
@@ -191,7 +191,7 @@ impl PdfOperator for SetFlatnessTolerance {
         )))
     }
 
-    fn call<T: PdfOperatorBackend>(&self, backend: &mut T) -> Result<(), T::ErrorType> {
+    fn call<T: PdfOperatorBackend>(&self, backend: &mut T) -> Result<(), BackendError<T>> {
         backend.set_flatness_tolerance(self.tolerance)
     }
 }
@@ -221,7 +221,7 @@ impl PdfOperator for SetRenderingIntent {
         Ok(PdfOperatorVariant::SetRenderingIntent(Self::new(intent)))
     }
 
-    fn call<T: PdfOperatorBackend>(&self, backend: &mut T) -> Result<(), T::ErrorType> {
+    fn call<T: PdfOperatorBackend>(&self, backend: &mut T) -> Result<(), BackendError<T>> {
         backend.set_rendering_intent(&self.intent)
     }
 }
@@ -239,7 +239,7 @@ impl PdfOperator for SaveGraphicsState {
         Ok(PdfOperatorVariant::SaveGraphicsState(Self))
     }
 
-    fn call<T: PdfOperatorBackend>(&self, backend: &mut T) -> Result<(), T::ErrorType> {
+    fn call<T: PdfOperatorBackend>(&self, backend: &mut T) -> Result<(), BackendError<T>> {
         backend.save_graphics_state()
     }
 }
@@ -257,7 +257,7 @@ impl PdfOperator for RestoreGraphicsState {
         Ok(PdfOperatorVariant::RestoreGraphicsState(Self))
     }
 
-    fn call<T: PdfOperatorBackend>(&self, backend: &mut T) -> Result<(), T::ErrorType> {
+    fn call<T: PdfOperatorBackend>(&self, backend: &mut T) -> Result<(), BackendError<T>> {
         backend.restore_graphics_state()
     }
 }
@@ -296,7 +296,7 @@ impl PdfOperator for ConcatMatrix {
         ])))
     }
 
-    fn call<T: PdfOperatorBackend>(&self, backend: &mut T) -> Result<(), T::ErrorType> {
+    fn call<T: PdfOperatorBackend>(&self, backend: &mut T) -> Result<(), BackendError<T>> {
         backend.concat_matrix(&self.matrix)
     }
 }
@@ -329,7 +329,7 @@ impl PdfOperator for SetGraphicsStateFromDict {
         )))
     }
 
-    fn call<T: PdfOperatorBackend>(&self, backend: &mut T) -> Result<(), T::ErrorType> {
+    fn call<T: PdfOperatorBackend>(&self, backend: &mut T) -> Result<(), BackendError<T>> {
         backend.set_graphics_state_from_dict(&self.dict_name)
     }
 }