diff --git a/src/platform/emscripten.rs b/src/platform/emscripten.rs index eabdc6a..692592b 100644 --- a/src/platform/emscripten.rs +++ b/src/platform/emscripten.rs @@ -40,7 +40,7 @@ impl Platform for EmscriptenPlatform { let mut buf = vec![0u8; len]; rwops .read_exact(&mut buf) - .map_err(|e| AssetError::Io(std::io::Error::new(std::io::ErrorKind::Other, e)))?; + .map_err(|e| AssetError::Io(std::io::Error::other(e)))?; Ok(Cow::Owned(buf)) } @@ -56,6 +56,6 @@ extern "C" { unsafe fn get_canvas_size() -> (u32, u32) { let mut width = 0.0; let mut height = 0.0; - emscripten_get_element_css_size("canvas\0".as_ptr(), &mut width, &mut height); + emscripten_get_element_css_size(c"canvas".as_ptr().cast(), &mut width, &mut height); (width as u32, height as u32) } diff --git a/src/texture/directional.rs b/src/texture/directional.rs index aa71a7f..7449923 100644 --- a/src/texture/directional.rs +++ b/src/texture/directional.rs @@ -21,10 +21,8 @@ impl DirectionalAnimatedTexture { } pub fn tick(&mut self, dt: f32) { - for texture in self.textures.iter_mut() { - if let Some(texture) = texture { - texture.tick(dt); - } + for texture in self.textures.iter_mut().flatten() { + texture.tick(dt); } }