diff options
| author |  Poly <marynczakbartlomiej@gmail.com> | 2022-07-04 01:17:29 +0200 |
|---|---|---|
| committer |  Héctor Ramón Jiménez <hector0193@gmail.com> | 2022-07-09 17:07:38 +0200 |
| commit | 15f794b7a89efb3299cb85b392ec13af145fb0fd (patch) | |
| tree | 39d8c740168e4c09e15538451ba7f3899051ad43 /glow | |
| parent | e053e25d2ccb17f7a162685a106a8bbd915a873f (diff) | |
| download | iced-15f794b7a89efb3299cb85b392ec13af145fb0fd.tar.gz iced-15f794b7a89efb3299cb85b392ec13af145fb0fd.tar.bz2 iced-15f794b7a89efb3299cb85b392ec13af145fb0fd.zip | |
Address Clippy lints
Diffstat (limited to 'glow')
| -rw-r--r-- | glow/src/program.rs | 2 | ||||
| -rw-r--r-- | glow/src/quad/compatibility.rs | 10 | ||||
| -rw-r--r-- | glow/src/quad/core.rs | 2 | ||||
| -rw-r--r-- | glow/src/text.rs | 5 |
4 files changed, 9 insertions, 10 deletions
diff --git a/glow/src/program.rs b/glow/src/program.rs index 9a02d578..1eb9c535 100644 --- a/glow/src/program.rs +++ b/glow/src/program.rs @@ -70,7 +70,7 @@ impl Shader { unsafe { let shader = gl.create_shader(stage).expect("Cannot create shader"); - gl.shader_source(shader, &content); + gl.shader_source(shader, content); gl.compile_shader(shader); if !gl.get_shader_compile_status(shader) { diff --git a/glow/src/quad/compatibility.rs b/glow/src/quad/compatibility.rs index 76f98ab7..7224e206 100644 --- a/glow/src/quad/compatibility.rs +++ b/glow/src/quad/compatibility.rs @@ -110,10 +110,8 @@ impl Pipeline { bounds: Rectangle<u32>, ) { // TODO: Remove this allocation (probably by changing the shader and removing the need of two `position`) - let vertices: Vec<Vertex> = instances - .iter() - .flat_map(|quad| Vertex::from_quad(quad)) - .collect(); + let vertices: Vec<Vertex> = + instances.iter().flat_map(Vertex::from_quad).collect(); // TODO: Remove this allocation (or allocate only when needed) let indices: Vec<i32> = (0..instances.len().min(MAX_QUADS) as i32) @@ -187,13 +185,13 @@ impl Pipeline { gl.buffer_sub_data_u8_slice( glow::ARRAY_BUFFER, 0, - bytemuck::cast_slice(&vertices), + bytemuck::cast_slice(vertices), ); gl.buffer_sub_data_u8_slice( glow::ELEMENT_ARRAY_BUFFER, 0, - bytemuck::cast_slice(&indices), + bytemuck::cast_slice(indices), ); gl.draw_elements( diff --git a/glow/src/quad/core.rs b/glow/src/quad/core.rs index f37300f6..3e51b1ca 100644 --- a/glow/src/quad/core.rs +++ b/glow/src/quad/core.rs @@ -154,7 +154,7 @@ impl Pipeline { gl.buffer_sub_data_u8_slice( glow::ARRAY_BUFFER, 0, - bytemuck::cast_slice(&instances), + bytemuck::cast_slice(instances), ); gl.draw_arrays_instanced( diff --git a/glow/src/text.rs b/glow/src/text.rs index 0d45d61b..37ccdece 100644 --- a/glow/src/text.rs +++ b/glow/src/text.rs @@ -54,7 +54,7 @@ impl Pipeline { #[cfg(target_arch = "wasm32")] let draw_brush_builder = draw_brush_builder.draw_cache_align_4x4(true); - let draw_brush = draw_brush_builder.build(&gl); + let draw_brush = draw_brush_builder.build(gl); let measure_brush = glyph_brush::GlyphBrushBuilder::using_font(font).build(); @@ -180,7 +180,8 @@ impl Pipeline { } b_count += utf8_len; } - return byte_index; + + byte_index }; if !nearest_only { |