Skip to content

Commit 0b2e1b1

Browse files
committed
Fix ci.
1 parent fd984e8 commit 0b2e1b1

File tree

6 files changed

+15
-16
lines changed

6 files changed

+15
-16
lines changed

crates/processing_pyo3/src/gltf.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,4 +48,3 @@ impl Gltf {
4848
Ok(Light { entity })
4949
}
5050
}
51-

crates/processing_pyo3/src/lib.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ pub(crate) mod shader;
1717
#[cfg(feature = "webcam")]
1818
mod webcam;
1919

20-
use graphics::{get_graphics, get_graphics_mut, Geometry, Graphics, Image, Light, Topology};
20+
use graphics::{Geometry, Graphics, Image, Light, Topology, get_graphics, get_graphics_mut};
2121
use material::Material;
2222

2323
use pyo3::{
@@ -111,22 +111,22 @@ fn detect_environment(py: Python<'_>) -> PyResult<String> {
111111
mod mewnala {
112112
use super::*;
113113

114+
#[pymodule_export]
115+
use super::Geometry;
116+
#[pymodule_export]
117+
use super::Gltf;
114118
#[pymodule_export]
115119
use super::Graphics;
116120
#[pymodule_export]
117121
use super::Image;
118122
#[pymodule_export]
119123
use super::Light;
120124
#[pymodule_export]
121-
use super::Topology;
122-
#[pymodule_export]
123125
use super::Material;
124126
#[pymodule_export]
125-
use super::Gltf;
126-
#[pymodule_export]
127-
use super::Geometry;
128-
#[pymodule_export]
129127
use super::Shader;
128+
#[pymodule_export]
129+
use super::Topology;
130130

131131
#[pymodule_export]
132132
const ROUND: u8 = 0;
@@ -146,8 +146,8 @@ mod mewnala {
146146
#[pyfunction]
147147
#[pyo3(pass_module)]
148148
fn load_gltf(module: &Bound<'_, PyModule>, path: &str) -> PyResult<Gltf> {
149-
let graphics = get_graphics(module)?
150-
.ok_or_else(|| PyRuntimeError::new_err("call size() first"))?;
149+
let graphics =
150+
get_graphics(module)?.ok_or_else(|| PyRuntimeError::new_err("call size() first"))?;
151151
let entity = ::processing::prelude::gltf_load(graphics.entity, path)
152152
.map_err(|e| PyRuntimeError::new_err(format!("{e}")))?;
153153
Ok(Gltf::from_entity(entity))

crates/processing_render/src/lib.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#![allow(clippy::module_inception)]
2+
13
pub mod geometry;
24
pub mod gltf;
35
mod graphics;

examples/animated_mesh.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ fn sketch() -> error::Result<()> {
7575
while glfw_ctx.poll_events() {
7676
for z in 0..grid_size {
7777
for x in 0..grid_size {
78-
let idx = (z * grid_size + x) as u32;
78+
let idx = z * grid_size + x;
7979
let px = x as f32 * spacing - offset;
8080
let pz = z as f32 * spacing - offset;
8181
let wave = (px * 0.1 + time).sin() * (pz * 0.1 + time).cos() * 20.0;

examples/glfw.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,8 @@ impl GlfwContext {
8484
self.glfw.poll_events();
8585

8686
for (_, event) in glfw::flush_messages(&self.events) {
87-
match event {
88-
WindowEvent::Close => return false,
89-
_ => {}
87+
if event == WindowEvent::Close {
88+
return false;
9089
}
9190
}
9291

tools/generate_stubs/src/main.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ fn main() {
4141

4242
eprintln!("Introspecting: {}", cdylib_path.display());
4343

44-
let module =
45-
introspect_cdylib(&cdylib_path, "mewnala").expect("Failed to introspect cdylib");
44+
let module = introspect_cdylib(&cdylib_path, "mewnala").expect("Failed to introspect cdylib");
4645

4746
let stubs = module_stub_files(&module);
4847

0 commit comments

Comments
 (0)