Merge pull request hannobraun#2343 from hannobraun/rust

Upgrade to Rust 1.78.0
thestig4242 · May 6, 2024 · 0e83bf9 · 0e83bf9
2 parents 57d61b3 + 1dcb36b
commit 0e83bf9
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/crates/fj-viewer/src/graphics/model.rs b/crates/fj-viewer/src/graphics/model.rs
@@ -177,7 +177,6 @@ pub fn load_model(
 }
 
 pub trait DrawModel<'a> {
-    fn draw_mesh(&mut self, mesh: &'a Mesh, material: &'a Material);
     fn draw_mesh_instanced(
         &mut self,
         mesh: &'a Mesh,
@@ -193,10 +192,6 @@ impl<'a, 'b> DrawModel<'b> for wgpu::RenderPass<'a>
 where
     'b: 'a,
 {
-    fn draw_mesh(&mut self, mesh: &'b Mesh, material: &'b Material) {
-        self.draw_mesh_instanced(mesh, material, 0..1);
-    }
-
     fn draw_mesh_instanced(
         &mut self,
         mesh: &'b Mesh,

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,5 +1,5 @@
 [toolchain]
-channel = "1.77.0"
+channel = "1.78.0"
 components = ["rustfmt", "clippy"]
 targets = [
     "aarch64-apple-ios",