iris: fold render state into Ui

benches/message_list.rs

@@ -2,14 +2,14 @@ use iris::prelude::*;
 use std::time::Instant;
 
 struct BenchRsc {
-    ui: UiData,
+    ui: Ui,
 }
 
 impl UiRsc for BenchRsc {
-    fn ui(&self) -> &UiData {
+    fn ui(&self) -> &Ui {
         &self.ui
     }
-    fn ui_mut(&mut self) -> &mut UiData {
+    fn ui_mut(&mut self) -> &mut Ui {
         &mut self.ui
     }
 }
@@ -60,9 +60,7 @@ fn report(label: &str, elapsed: std::time::Duration, draws: u64, rewrites: u64,
 }
 
 fn bench_first_frame(n: usize) {
-    let mut rsc = BenchRsc {
-        ui: UiData::default(),
-    };
+    let mut rsc = BenchRsc { ui: Ui::default() };
     let (_list, root) = build_message_list(&mut rsc, n, 20);
     let mut render = UiRenderState::new();
     render.resize((1080.0, 2000.0));
@@ -81,9 +79,7 @@ fn bench_first_frame(n: usize) {
 }
 
 fn bench_scroll(n: usize, ticks: usize) {
-    let mut rsc = BenchRsc {
-        ui: UiData::default(),
-    };
+    let mut rsc = BenchRsc { ui: Ui::default() };
     let (scroll, root) = build_message_list(&mut rsc, n, 20);
     let mut render = UiRenderState::new();
     render.resize((1080.0, 2000.0));
@@ -120,9 +116,7 @@ fn bench_scroll(n: usize, ticks: usize) {
 }
 
 fn bench_input_grows(n: usize, lines: usize) {
-    let mut rsc = BenchRsc {
-        ui: UiData::default(),
-    };
+    let mut rsc = BenchRsc { ui: Ui::default() };
     let (scroll, list_root) = build_message_list(&mut rsc, n, 20);
     let list_area = rsc.ui.widgets.add_strong(Sized {
         inner: list_root,
@@ -183,9 +177,7 @@ fn bench_input_grows(n: usize, lines: usize) {
 }
 
 fn bench_insert_above_anchor(n: usize, inserts: usize) {
-    let mut rsc = BenchRsc {
-        ui: UiData::default(),
-    };
+    let mut rsc = BenchRsc { ui: Ui::default() };
     let (list, root) = build_message_list(&mut rsc, n, 20);
     let mut render = UiRenderState::new();
     render.resize((1080.0, 2000.0));
@@ -230,9 +222,7 @@ fn bench_insert_above_anchor(n: usize, inserts: usize) {
 }
 
 fn bench_expand_holds_edge(n: usize, growths: usize) {
-    let mut rsc = BenchRsc {
-        ui: UiData::default(),
-    };
+    let mut rsc = BenchRsc { ui: Ui::default() };
     let mut list = LazySpan::new(Dir::DOWN, Pin::End);
     let growable_index = n.saturating_sub(3);
     let mut growable = None;
@@ -302,9 +292,7 @@ fn bench_expand_holds_edge(n: usize, growths: usize) {
 }
 
 fn bench_redraw_big_text(chars: usize, redraws: usize) {
-    let mut rsc = BenchRsc {
-        ui: UiData::default(),
-    };
+    let mut rsc = BenchRsc { ui: Ui::default() };
     let content: String = (0..chars)
         .map(|i| char::from(b'a' + (i % 26) as u8))
         .collect();