Remove lifetime from PlainEditor and PlainEditorOp

examples/vello_editor/src/main.rs

@@ -49,7 +49,7 @@ struct SimpleVelloApp<'s> {
  scene: Scene,
 
  // Our text state object
- editor: text::Editor<'s>,
+ editor: text::Editor,
 }
 
 impl ApplicationHandler for SimpleVelloApp<'_> {

examples/vello_editor/src/text.rs

@@ -20,19 +20,19 @@ use parley::{FontContext, LayoutContext, PlainEditor, PlainEditorOp};
 pub const INSET: f32 = 32.0;
 
 #[derive(Default)]
-pub struct Editor<'a> {
+pub struct Editor {
  font_cx: FontContext,
  layout_cx: LayoutContext<Color>,
- editor: PlainEditor<'a, Color>,
+ editor: PlainEditor<Color>,
  last_click_time: Option<Instant>,
  click_count: u32,
  pointer_down: bool,
  cursor_pos: (f32, f32),
  modifiers: Option<Modifiers>,
 }
 
-impl<'a> Editor<'a> {
- pub fn transact(&mut self, t: impl IntoIterator<Item = PlainEditorOp<'a, Color>>) {
+impl Editor {
+ pub fn transact(&mut self, t: impl IntoIterator<Item = PlainEditorOp<Color>>) {
  self.editor
  .transact(&mut self.font_cx, &mut self.layout_cx, t);
  }

parley/src/layout/editor.rs

@@ -22,11 +22,11 @@ pub enum ActiveText<'a> {
 }
 
 /// Basic plain text editor with a single default style.
-pub struct PlainEditor<'a, T>
+pub struct PlainEditor<T>
 where
  T: Brush + Clone + Debug + PartialEq + Default,
 {
- default_style: Arc<[StyleProperty<'a, T>]>,
+ default_style: Arc<[StyleProperty<'static, T>]>,
  buffer: String,
  layout: Layout<T>,
  selection: Selection,
@@ -36,7 +36,7 @@ where
 }
 
 // TODO: When MSRV >= 1.80 we can remove this. Default was not implemented for Arc<[T]> where T: !Default until 1.80
-impl<'a, T> Default for PlainEditor<'a, T>
+impl<T> Default for PlainEditor<T>
 where
  T: Brush + Clone + Debug + PartialEq + Default,
 {
@@ -55,7 +55,7 @@ where
 
 /// Operations on a `PlainEditor` for `PlainEditor::transact`
 #[non_exhaustive]
-pub enum PlainEditorOp<'a, T>
+pub enum PlainEditorOp<T>
 where
  T: Brush + Clone + Debug + PartialEq + Default,
 {
@@ -66,7 +66,7 @@ where
  /// Set the scale for the layout
  SetScale(f32),
  /// Set the default style for the layout
- SetDefaultStyle(Arc<[StyleProperty<'a, T>]>),
+ SetDefaultStyle(Arc<[StyleProperty<'static, T>]>),
  /// Insert at cursor, or replace selection
  InsertOrReplaceSelection(Arc<str>),
  /// Delete the selection
@@ -133,7 +133,7 @@ where
  ExtendSelectionToPoint(f32, f32),
 }
 
-impl<'a, T> PlainEditor<'a, T>
+impl<T> PlainEditor<T>
 where
  T: Brush + Clone + Debug + PartialEq + Default,
 {
@@ -142,7 +142,7 @@ where
  &mut self,
  font_cx: &mut FontContext,
  layout_cx: &mut LayoutContext<T>,
- t: impl IntoIterator<Item = PlainEditorOp<'a, T>>,
+ t: impl IntoIterator<Item = PlainEditorOp<T>>,
  ) {
  let mut layout_after = false;