djkato/egui
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

clippy fixes for rust 1.52

Browse source
This commit is contained in:
Emil Ernerfeldt 2021-05-06 20:49:22 +02:00
parent 29668b5128
commit 0d71017ad4
6 changed files with 70 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
egui/src/containers/scroll_area.rs
View file

@ -141,9 +141,9 @@ impl ScrollArea {
Prepared { Prepared {
id, id,
state, state,
current_scroll_bar_width,
always_show_scroll, always_show_scroll,
inner_rect, inner_rect,
current_scroll_bar_width,
content_ui, content_ui,
} }
} }

2
egui/src/widgets/color_picker.rs
View file

@ -311,7 +311,7 @@ fn color_picker_hsvag_2d(ui: &mut Ui, hsva: &mut HsvaGamma, alpha: Alpha) {
ui.label("Value"); ui.label("Value");
ui.end_row(); ui.end_row();
color_slider_2d(ui, v, s, |v, s| HsvaGamma { v, s, ..opaque }.into()); color_slider_2d(ui, v, s, |v, s| HsvaGamma { s, v, ..opaque }.into());
ui.label("Value / Saturation"); ui.label("Value / Saturation");
ui.end_row(); ui.end_row();
}); });

6
egui_demo_lib/src/apps/demo/demo_windows.rs
View file

@ -42,12 +42,12 @@ impl Default for Demos {
.to_owned(), .to_owned(),
); );
Self { open, demos } Self { demos, open }
} }
} }
impl Demos { impl Demos {
pub fn checkboxes(&mut self, ui: &mut Ui) { pub fn checkboxes(&mut self, ui: &mut Ui) {
let Self { open, demos } = self; let Self { demos, open } = self;
for demo in demos { for demo in demos {
let mut is_open = open.contains(demo.name()); let mut is_open = open.contains(demo.name());
ui.checkbox(&mut is_open, demo.name()); ui.checkbox(&mut is_open, demo.name());
@ -56,7 +56,7 @@ impl Demos {
} }
pub fn show(&mut self, ctx: &CtxRef) { pub fn show(&mut self, ctx: &CtxRef) {
let Self { open, demos } = self; let Self { demos, open } = self;
for demo in demos { for demo in demos {
let mut is_open = open.contains(demo.name()); let mut is_open = open.contains(demo.name());
demo.show(ctx, &mut is_open); demo.show(ctx, &mut is_open);

16
egui_glium/src/painter.rs
View file

@ -303,15 +303,13 @@ impl Painter {
} }
pub fn upload_pending_user_textures(&mut self, facade: &dyn glium::backend::Facade) { pub fn upload_pending_user_textures(&mut self, facade: &dyn glium::backend::Facade) {
for user_texture in &mut self.user_textures { for user_texture in self.user_textures.iter_mut().flatten() {
if let Some(user_texture) = user_texture { if user_texture.gl_texture.is_none() {
if user_texture.gl_texture.is_none() { let pixels = std::mem::take(&mut user_texture.pixels);
let pixels = std::mem::take(&mut user_texture.pixels); let format = texture::SrgbFormat::U8U8U8U8;
let format = texture::SrgbFormat::U8U8U8U8; let mipmaps = texture::MipmapsOption::NoMipmap;
let mipmaps = texture::MipmapsOption::NoMipmap; user_texture.gl_texture =
user_texture.gl_texture = Some(SrgbTexture2d::with_format(facade, pixels, format, mipmaps).unwrap());
Some(SrgbTexture2d::with_format(facade, pixels, format, mipmaps).unwrap());
}
} }
} }
} }

60
egui_web/src/webgl1.rs
View file

@ -151,41 +151,39 @@ impl WebGlPainter {
fn upload_user_textures(&mut self) { fn upload_user_textures(&mut self) {
let gl = &self.gl; let gl = &self.gl;
for user_texture in &mut self.user_textures { for user_texture in self.user_textures.iter_mut().flatten() {
if let Some(user_texture) = user_texture { if user_texture.gl_texture.is_none() {
if user_texture.gl_texture.is_none() { let pixels = std::mem::take(&mut user_texture.pixels);
let pixels = std::mem::take(&mut user_texture.pixels);
let gl_texture = gl.create_texture().unwrap(); let gl_texture = gl.create_texture().unwrap();
gl.bind_texture(Gl::TEXTURE_2D, Some(&gl_texture)); gl.bind_texture(Gl::TEXTURE_2D, Some(&gl_texture));
gl.tex_parameteri(Gl::TEXTURE_2D, Gl::TEXTURE_WRAP_S, Gl::CLAMP_TO_EDGE as i32); gl.tex_parameteri(Gl::TEXTURE_2D, Gl::TEXTURE_WRAP_S, Gl::CLAMP_TO_EDGE as i32);
gl.tex_parameteri(Gl::TEXTURE_2D, Gl::TEXTURE_WRAP_T, Gl::CLAMP_TO_EDGE as i32); gl.tex_parameteri(Gl::TEXTURE_2D, Gl::TEXTURE_WRAP_T, Gl::CLAMP_TO_EDGE as i32);
gl.tex_parameteri(Gl::TEXTURE_2D, Gl::TEXTURE_MIN_FILTER, Gl::LINEAR as i32); gl.tex_parameteri(Gl::TEXTURE_2D, Gl::TEXTURE_MIN_FILTER, Gl::LINEAR as i32);
gl.tex_parameteri(Gl::TEXTURE_2D, Gl::TEXTURE_MAG_FILTER, Gl::LINEAR as i32); gl.tex_parameteri(Gl::TEXTURE_2D, Gl::TEXTURE_MAG_FILTER, Gl::LINEAR as i32);
gl.bind_texture(Gl::TEXTURE_2D, Some(&gl_texture)); gl.bind_texture(Gl::TEXTURE_2D, Some(&gl_texture));
// TODO: https://developer.mozilla.org/en-US/docs/Web/API/EXT_sRGB // TODO: https://developer.mozilla.org/en-US/docs/Web/API/EXT_sRGB
let level = 0; let level = 0;
let internal_format = Gl::RGBA; let internal_format = Gl::RGBA;
let border = 0; let border = 0;
let src_format = Gl::RGBA; let src_format = Gl::RGBA;
let src_type = Gl::UNSIGNED_BYTE; let src_type = Gl::UNSIGNED_BYTE;
gl.tex_image_2d_with_i32_and_i32_and_i32_and_format_and_type_and_opt_u8_array( gl.tex_image_2d_with_i32_and_i32_and_i32_and_format_and_type_and_opt_u8_array(
Gl::TEXTURE_2D, Gl::TEXTURE_2D,
level, level,
internal_format as i32, internal_format as i32,
user_texture.size.0 as i32, user_texture.size.0 as i32,
user_texture.size.1 as i32, user_texture.size.1 as i32,
border, border,
src_format, src_format,
src_type, src_type,
Some(&pixels), Some(&pixels),
) )
.unwrap(); .unwrap();
user_texture.gl_texture = Some(gl_texture); user_texture.gl_texture = Some(gl_texture);
}
} }
} }
} }

61
egui_web/src/webgl2.rs
View file

@ -153,42 +153,39 @@ impl WebGl2Painter {
fn upload_user_textures(&mut self) { fn upload_user_textures(&mut self) {
let gl = &self.gl; let gl = &self.gl;
for user_texture in self.user_textures.iter_mut().flatten() {
if user_texture.gl_texture.is_none() {
let pixels = std::mem::take(&mut user_texture.pixels);
for user_texture in &mut self.user_textures { let gl_texture = gl.create_texture().unwrap();
if let Some(user_texture) = user_texture { gl.bind_texture(Gl::TEXTURE_2D, Some(&gl_texture));
if user_texture.gl_texture.is_none() { gl.tex_parameteri(Gl::TEXTURE_2D, Gl::TEXTURE_WRAP_S, Gl::CLAMP_TO_EDGE as i32);
let pixels = std::mem::take(&mut user_texture.pixels); gl.tex_parameteri(Gl::TEXTURE_2D, Gl::TEXTURE_WRAP_T, Gl::CLAMP_TO_EDGE as i32);
gl.tex_parameteri(Gl::TEXTURE_2D, Gl::TEXTURE_MIN_FILTER, Gl::LINEAR as i32);
gl.tex_parameteri(Gl::TEXTURE_2D, Gl::TEXTURE_MAG_FILTER, Gl::LINEAR as i32);
let gl_texture = gl.create_texture().unwrap(); gl.bind_texture(Gl::TEXTURE_2D, Some(&gl_texture));
gl.bind_texture(Gl::TEXTURE_2D, Some(&gl_texture));
gl.tex_parameteri(Gl::TEXTURE_2D, Gl::TEXTURE_WRAP_S, Gl::CLAMP_TO_EDGE as i32);
gl.tex_parameteri(Gl::TEXTURE_2D, Gl::TEXTURE_WRAP_T, Gl::CLAMP_TO_EDGE as i32);
gl.tex_parameteri(Gl::TEXTURE_2D, Gl::TEXTURE_MIN_FILTER, Gl::LINEAR as i32);
gl.tex_parameteri(Gl::TEXTURE_2D, Gl::TEXTURE_MAG_FILTER, Gl::LINEAR as i32);
gl.bind_texture(Gl::TEXTURE_2D, Some(&gl_texture)); let level = 0;
let internal_format = Gl::SRGB8_ALPHA8;
let border = 0;
let src_format = Gl::RGBA;
let src_type = Gl::UNSIGNED_BYTE;
gl.pixel_storei(Gl::UNPACK_ALIGNMENT, 1);
gl.tex_image_2d_with_i32_and_i32_and_i32_and_format_and_type_and_opt_u8_array(
Gl::TEXTURE_2D,
level,
internal_format as i32,
user_texture.size.0 as i32,
user_texture.size.1 as i32,
border,
src_format,
src_type,
Some(&pixels),
)
.unwrap();
let level = 0; user_texture.gl_texture = Some(gl_texture);
let internal_format = Gl::SRGB8_ALPHA8;
let border = 0;
let src_format = Gl::RGBA;
let src_type = Gl::UNSIGNED_BYTE;
gl.pixel_storei(Gl::UNPACK_ALIGNMENT, 1);
gl.tex_image_2d_with_i32_and_i32_and_i32_and_format_and_type_and_opt_u8_array(
Gl::TEXTURE_2D,
level,
internal_format as i32,
user_texture.size.0 as i32,
user_texture.size.1 as i32,
border,
src_format,
src_type,
Some(&pixels),
)
.unwrap();
user_texture.gl_texture = Some(gl_texture);
}
} }
} }
} }