Run cargo clippy --fix --all --all-targets to perform some small cleanups

Author: MarijnS95

Cargo.toml

@@ -13,3 +13,6 @@ members = [
     "tests/test_webgl_stdweb",
     "khronos_api",
 ]
+
+[workspace.lints.clippy]
+uninlined_format_args = "deny"

gl/Cargo.toml

@@ -21,3 +21,6 @@ gl_generator = { version = "0.14.0", path = "../gl_generator" }
 
 [dev-dependencies]
 glutin = "0.24"
+
+[lints]
+workspace = true

gl/build.rs

@@ -21,7 +21,7 @@ use std::path::Path;
 
 fn main() {
     let dest = env::var("OUT_DIR").unwrap();
-    let mut file = File::create(&Path::new(&dest).join("bindings.rs")).unwrap();
+    let mut file = File::create(Path::new(&dest).join("bindings.rs")).unwrap();
 
     Registry::new(Api::Gl, (4, 6), Profile::Core, Fallbacks::All, [])
         .write_bindings(GlobalGenerator, &mut file)

gl/examples/basic.rs

@@ -33,11 +33,8 @@ fn main() {
         use glutin::event_loop::ControlFlow;
         *control_flow = ControlFlow::Wait;
         match event {
-            Event::LoopDestroyed => return,
-            Event::WindowEvent { event, .. } => match event {
-                WindowEvent::CloseRequested => *control_flow = ControlFlow::Exit,
-                _ => (),
-            },
+            Event::LoopDestroyed => (),
+            Event::WindowEvent { event, .. } => if event == WindowEvent::CloseRequested { *control_flow = ControlFlow::Exit },
             Event::RedrawRequested(_) => {
                 unsafe {
                     gl::ClearColor(0.3, 0.3, 0.3, 1.0);

gl/examples/triangle.rs

@@ -25,15 +25,15 @@ use std::str;
 static VERTEX_DATA: [GLfloat; 6] = [0.0, 0.5, 0.5, -0.5, -0.5, -0.5];
 
 // Shader sources
-static VS_SRC: &'static str = "
+static VS_SRC: &str = "
 #version 150
 in vec2 position;
 
 void main() {
     gl_Position = vec4(position, 0.0, 1.0);
 }";
 
-static FS_SRC: &'static str = "
+static FS_SRC: &str = "
 #version 150
 out vec4 out_color;
 
@@ -168,20 +168,17 @@ fn main() {
         use glutin::event_loop::ControlFlow;
         *control_flow = ControlFlow::Wait;
         match event {
-            Event::LoopDestroyed => return,
-            Event::WindowEvent { event, .. } => match event {
-                WindowEvent::CloseRequested => {
-                    // Cleanup
-                    unsafe {
-                        gl::DeleteProgram(program);
-                        gl::DeleteShader(fs);
-                        gl::DeleteShader(vs);
-                        gl::DeleteBuffers(1, &vbo);
-                        gl::DeleteVertexArrays(1, &vao);
-                    }
-                    *control_flow = ControlFlow::Exit
-                },
-                _ => (),
+            Event::LoopDestroyed => (),
+            Event::WindowEvent { event, .. } => if event == WindowEvent::CloseRequested {
+                // Cleanup
+                unsafe {
+                    gl::DeleteProgram(program);
+                    gl::DeleteShader(fs);
+                    gl::DeleteShader(vs);
+                    gl::DeleteBuffers(1, &vbo);
+                    gl::DeleteVertexArrays(1, &vao);
+                }
+                *control_flow = ControlFlow::Exit
             },
             Event::RedrawRequested(_) => {
                 unsafe {

gl_generator/Cargo.toml

@@ -26,3 +26,6 @@ unstable_generator_utils = []
 khronos_api = { version = "3.1.0", path = "../khronos_api" }
 log = "0.4"
 xml-rs = "0.8"
+
+[lints]
+workspace = true

gl_generator/generators/debug_struct_gen.rs

@@ -215,10 +215,10 @@ where
             fallbacks = match registry.aliases.get(&cmd.proto.ident) {
                 Some(fbs) => fbs
                     .iter()
-                    .map(|name| format!("\"{}\"", super::gen_symbol_name(registry.api, &name)))
+                    .map(|name| format!("\"{}\"", super::gen_symbol_name(registry.api, name)))
                     .collect::<Vec<_>>()
                     .join(", "),
-                None => format!(""),
+                None => String::new(),
             },
         )?
     }
@@ -234,22 +234,18 @@ where
         let idents = super::gen_parameters(cmd, true, false);
         let typed_params = super::gen_parameters(cmd, false, true);
         let println = format!(
-            "println!(\"[OpenGL] {}({})\" {});",
+            "println!(\"[OpenGL] {}({})\");",
             cmd.proto.ident,
-            (0..idents.len())
-                .map(|_| "{:?}".to_string())
-                .collect::<Vec<_>>()
-                .join(", "),
             idents
                 .iter()
                 .zip(typed_params.iter())
                 .map(|(name, ty)| if ty.contains("GLDEBUGPROC") {
-                    format!(", \"<callback>\"")
+                    "<callback>".to_string()
                 } else {
-                    format!(", {}", name)
+                    format!("{{{name}:?}}")
                 })
                 .collect::<Vec<_>>()
-                .concat()
+                .join(", "),
         );
 
         writeln!(dest,
@@ -271,12 +267,11 @@ where
                                      registry
                                          .cmds
                                          .iter()
-                                         .find(|cmd| cmd.proto.ident == "GetError")
-                                         .is_some() {
-                          format!(r#"match __gl_imports::mem::transmute::<_, extern "system" fn() -> u32>
-                    (self.GetError.f)() {{ 0 => (), r => println!("[OpenGL] ^ GL error triggered: {{}}", r) }}"#)
+                                         .any(|cmd| cmd.proto.ident == "GetError") {
+                          r#"match __gl_imports::mem::transmute::<_, extern "system" fn() -> u32>
+                    (self.GetError.f)() { 0 => (), r => println!("[OpenGL] ^ GL error triggered: {r}") }"#.to_string()
                       } else {
-                          format!("")
+                          String::new()
                       })?
     }
 

gl_generator/generators/global_gen.rs

@@ -247,10 +247,7 @@ where
                     }}
                 }}
             }}
-        "##,
-            fnname = fnname,
-            fallbacks = fallbacks,
-            symbol = symbol
+        "##
         )?;
     }
 

gl_generator/generators/mod.rs

@@ -98,7 +98,7 @@ pub fn gen_parameters(cmd: &Cmd, with_idents: bool, with_types: bool) -> Vec<Str
             } else if with_types {
                 format!("{}", binding.ty)
             } else if with_idents {
-                format!("{}", binding.ident)
+                binding.ident.to_string()
             } else {
                 panic!()
             }
@@ -111,9 +111,9 @@ pub fn gen_parameters(cmd: &Cmd, with_idents: bool, with_types: bool) -> Vec<Str
 /// Example results: `"glClear"`, `"wglCreateContext"`, etc.
 pub fn gen_symbol_name(api: Api, cmd: &str) -> String {
     match api {
-        Api::Gl | Api::GlCore | Api::Gles1 | Api::Gles2 | Api::Glsc2 => format!("gl{}", cmd),
-        Api::Glx => format!("glX{}", cmd),
-        Api::Wgl => format!("wgl{}", cmd),
-        Api::Egl => format!("egl{}", cmd),
+        Api::Gl | Api::GlCore | Api::Gles1 | Api::Gles2 | Api::Glsc2 => format!("gl{cmd}"),
+        Api::Glx => format!("glX{cmd}"),
+        Api::Wgl => format!("wgl{cmd}"),
+        Api::Egl => format!("egl{cmd}"),
     }
 }

gl_generator/generators/struct_gen.rs

@@ -215,10 +215,10 @@ where
             fallbacks = match registry.aliases.get(&cmd.proto.ident) {
                 Some(fbs) => fbs
                     .iter()
-                    .map(|name| format!("\"{}\"", super::gen_symbol_name(registry.api, &name)))
+                    .map(|name| format!("\"{}\"", super::gen_symbol_name(registry.api, name)))
                     .collect::<Vec<_>>()
                     .join(", "),
-                None => format!(""),
+                None => String::new(),
             },
         )?
     }