Fix up CI

Author: friendlymatthew

src/renderer/app_state.rs

@@ -382,11 +382,11 @@ impl<'a> AppState<'a> {
                     #[cfg(target_os = "macos")]
                     if self.modifiers.state().super_key() {
                         let circle = self.mouse_state.selected_shape().map(|i| {
-                            self.editor_state
+                            *self
+                                .editor_state
                                 .get_element_by_id(i)
                                 .expect("selected id must be valid")
                                 .inner()
-                                .clone()
                         });
 
                         self.mouse_state.set_clipboard_shape(circle);
@@ -486,8 +486,8 @@ impl<'a> AppState<'a> {
     pub(crate) fn render(&self) -> Result<(), wgpu::SurfaceError> {
         let (output, view, mut encoder) = self.gpu_allocator.begin_frame()?;
 
-        let workgroup_count_x = (self.size.width + 15) / 16;
-        let workgroup_count_y = (self.size.height + 15) / 16;
+        let workgroup_count_x = self.size.width.div_ceil(16);
+        let workgroup_count_y = self.size.height.div_ceil(16);
 
         // Execute effect pipeline - automatically chains all effects with CPU-level conditionals!
         self.effect_pipeline.execute(

src/renderer/compute_effect.rs

@@ -10,7 +10,7 @@ pub struct ComputeEffect {
 }
 
 impl ComputeEffect {
-    pub fn builder<'a>(label: &'a str) -> ComputeEffectBuilder<'a> {
+    pub const fn builder<'a>(label: &'a str) -> ComputeEffectBuilder<'a> {
         ComputeEffectBuilder {
             label,
             shader_source: None,
@@ -50,12 +50,12 @@ pub struct ComputeEffectBuilder<'a> {
 }
 
 impl<'a> ComputeEffectBuilder<'a> {
-    pub fn with_shader(mut self, source: &'a str) -> Self {
+    pub const fn with_shader(mut self, source: &'a str) -> Self {
         self.shader_source = Some(source);
         self
     }
 
-    pub fn _with_entry_point(mut self, entry_point: &'a str) -> Self {
+    pub const fn _with_entry_point(mut self, entry_point: &'a str) -> Self {
         self.entry_point = entry_point;
         self
     }

src/renderer/effect_pipeline.rs

@@ -3,8 +3,10 @@ use anyhow::Result;
 
 use crate::renderer::feature_uniform::FeatureUniform;
 
+pub type DispatchConditionalFn = Box<dyn Fn(&FeatureUniform) -> bool>;
+
 pub struct EffectPipeline {
-    effects: Vec<(ComputeEffect, Box<dyn Fn(&FeatureUniform) -> bool>)>,
+    effects: Vec<(ComputeEffect, DispatchConditionalFn)>,
 
     texture_a: Texture,
     texture_b: Texture,
@@ -30,7 +32,7 @@ impl EffectPipeline {
         EffectPipelineBuilder::new(gpu_allocator, input_texture, width, height)
     }
 
-    pub fn texture_a(&self) -> &Texture {
+    pub const fn texture_a(&self) -> &Texture {
         &self.texture_a
     }
 
@@ -65,7 +67,7 @@ pub struct EffectPipelineBuilder<'a, 'b> {
     input_texture: &'a wgpu::TextureView,
     texture_a: Texture,
     texture_b: Texture,
-    effects: Vec<(ComputeEffect, Box<dyn Fn(&FeatureUniform) -> bool>)>,
+    effects: Vec<(ComputeEffect, DispatchConditionalFn)>,
 }
 
 impl<'a, 'b> EffectPipelineBuilder<'a, 'b> {

src/renderer/feature_uniform.rs

@@ -176,7 +176,7 @@ impl FeatureUniform {
 }
 
 impl FeatureUniform {
-    pub fn gamma(&self) -> u32 {
+    pub const fn gamma(&self) -> u32 {
         self.gamma
     }
 }

src/renderer/mouse_state.rs

@@ -63,8 +63,8 @@ impl MouseState {
         self.drag_offset = offset;
     }
 
-    pub(crate) fn clipboard_shape(&self) -> Option<Circle> {
-        self.clipboard_shape.clone()
+    pub(crate) const fn clipboard_shape(&self) -> Option<Circle> {
+        self.clipboard_shape
     }
 
     pub(crate) const fn set_clipboard_shape(&mut self, element_id: Option<Circle>) {