[cg] Add text module, move text stubs there

Author: cmyr

piet-coregraphics/src/lib.rs

@@ -1,5 +1,7 @@
 //! The CoreGraphics backend for the Piet 2D graphics abstraction.
 
+mod text;
+
 use std::borrow::Cow;
 use std::sync::Arc;
 
@@ -15,9 +17,13 @@ use core_graphics::image::CGImage;
 use piet::kurbo::{Affine, PathEl, Point, QuadBez, Rect, Shape, Size};
 
 use piet::{
-    Color, Error, FixedGradient, Font, FontBuilder, HitTestPoint, HitTestTextPosition, ImageFormat,
-    InterpolationMode, IntoBrush, LineCap, LineJoin, LineMetric, RenderContext, RoundInto,
-    StrokeStyle, Text, TextLayout, TextLayoutBuilder,
+    Color, Error, FixedGradient, ImageFormat, InterpolationMode, IntoBrush, LineCap, LineJoin,
+    RenderContext, RoundInto, StrokeStyle,
+};
+
+pub use crate::text::{
+    CoreGraphicsFont, CoreGraphicsFontBuilder, CoreGraphicsText, CoreGraphicsTextLayout,
+    CoreGraphicsTextLayoutBuilder,
 };
 
 pub struct CoreGraphicsContext<'a> {
@@ -42,17 +48,6 @@ pub enum Brush {
     Gradient,
 }
 
-pub struct CoreGraphicsFont;
-
-pub struct CoreGraphicsFontBuilder;
-
-#[derive(Clone)]
-pub struct CoreGraphicsTextLayout;
-
-pub struct CoreGraphicsTextLayoutBuilder {}
-
-pub struct CoreGraphicsText;
-
 impl<'a> RenderContext for CoreGraphicsContext<'a> {
     type Brush = Brush;
     type Text = CoreGraphicsText;
@@ -226,74 +221,6 @@ impl<'a> RenderContext for CoreGraphicsContext<'a> {
     }
 }
 
-impl Text for CoreGraphicsText {
-    type Font = CoreGraphicsFont;
-    type FontBuilder = CoreGraphicsFontBuilder;
-    type TextLayout = CoreGraphicsTextLayout;
-    type TextLayoutBuilder = CoreGraphicsTextLayoutBuilder;
-
-    fn new_font_by_name(&mut self, _name: &str, _size: f64) -> Self::FontBuilder {
-        unimplemented!();
-    }
-
-    fn new_text_layout(
-        &mut self,
-        _font: &Self::Font,
-        _text: &str,
-        _width: impl Into<Option<f64>>,
-    ) -> Self::TextLayoutBuilder {
-        unimplemented!();
-    }
-}
-
-impl Font for CoreGraphicsFont {}
-
-impl FontBuilder for CoreGraphicsFontBuilder {
-    type Out = CoreGraphicsFont;
-
-    fn build(self) -> Result<Self::Out, Error> {
-        unimplemented!();
-    }
-}
-
-impl TextLayoutBuilder for CoreGraphicsTextLayoutBuilder {
-    type Out = CoreGraphicsTextLayout;
-
-    fn build(self) -> Result<Self::Out, Error> {
-        unimplemented!()
-    }
-}
-
-impl TextLayout for CoreGraphicsTextLayout {
-    fn width(&self) -> f64 {
-        0.0
-    }
-
-    fn update_width(&mut self, _new_width: impl Into<Option<f64>>) -> Result<(), Error> {
-        unimplemented!()
-    }
-
-    fn line_text(&self, _line_number: usize) -> Option<&str> {
-        unimplemented!()
-    }
-
-    fn line_metric(&self, _line_number: usize) -> Option<LineMetric> {
-        unimplemented!()
-    }
-
-    fn line_count(&self) -> usize {
-        unimplemented!()
-    }
-
-    fn hit_test_point(&self, _point: Point) -> HitTestPoint {
-        unimplemented!()
-    }
-
-    fn hit_test_text_position(&self, _text_position: usize) -> Option<HitTestTextPosition> {
-        unimplemented!()
-    }
-}
-
 impl<'a> IntoBrush<CoreGraphicsContext<'a>> for Brush {
     fn make_brush<'b>(
         &'b self,

piet-coregraphics/src/text.rs

@@ -0,0 +1,86 @@
+//! Text related stuff for the coregraphics backend
+
+use piet::kurbo::Point;
+use piet::{
+    Error, Font, FontBuilder, HitTestPoint, HitTestTextPosition, LineMetric, Text, TextLayout,
+    TextLayoutBuilder,
+};
+
+pub struct CoreGraphicsFont;
+
+pub struct CoreGraphicsFontBuilder;
+
+#[derive(Clone)]
+pub struct CoreGraphicsTextLayout;
+
+pub struct CoreGraphicsTextLayoutBuilder {}
+
+pub struct CoreGraphicsText;
+
+impl Text for CoreGraphicsText {
+    type Font = CoreGraphicsFont;
+    type FontBuilder = CoreGraphicsFontBuilder;
+    type TextLayout = CoreGraphicsTextLayout;
+    type TextLayoutBuilder = CoreGraphicsTextLayoutBuilder;
+
+    fn new_font_by_name(&mut self, _name: &str, _size: f64) -> Self::FontBuilder {
+        unimplemented!();
+    }
+
+    fn new_text_layout(
+        &mut self,
+        _font: &Self::Font,
+        _text: &str,
+        _width: impl Into<Option<f64>>,
+    ) -> Self::TextLayoutBuilder {
+        unimplemented!();
+    }
+}
+
+impl Font for CoreGraphicsFont {}
+
+impl FontBuilder for CoreGraphicsFontBuilder {
+    type Out = CoreGraphicsFont;
+
+    fn build(self) -> Result<Self::Out, Error> {
+        unimplemented!();
+    }
+}
+
+impl TextLayoutBuilder for CoreGraphicsTextLayoutBuilder {
+    type Out = CoreGraphicsTextLayout;
+
+    fn build(self) -> Result<Self::Out, Error> {
+        unimplemented!()
+    }
+}
+
+impl TextLayout for CoreGraphicsTextLayout {
+    fn width(&self) -> f64 {
+        0.0
+    }
+
+    fn update_width(&mut self, _new_width: impl Into<Option<f64>>) -> Result<(), Error> {
+        unimplemented!()
+    }
+
+    fn line_text(&self, _line_number: usize) -> Option<&str> {
+        unimplemented!()
+    }
+
+    fn line_metric(&self, _line_number: usize) -> Option<LineMetric> {
+        unimplemented!()
+    }
+
+    fn line_count(&self) -> usize {
+        unimplemented!()
+    }
+
+    fn hit_test_point(&self, _point: Point) -> HitTestPoint {
+        unimplemented!()
+    }
+
+    fn hit_test_text_position(&self, _text_position: usize) -> Option<HitTestTextPosition> {
+        unimplemented!()
+    }
+}