Force inlining format args via clippy::uninlined_format_args

Author: MarijnS95

Cargo.toml

@@ -10,3 +10,6 @@ members = [
     "tests/test_with_extensions",
     "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_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

@@ -246,7 +246,7 @@ where
                 .map(|(name, ty)| if ty.contains("GLDEBUGPROC") {
                     ", \"<callback>\"".to_string()
                 } else {
-                    format!(", {}", name)
+                    format!(", {name}")
                 })
                 .collect::<Vec<_>>()
                 .concat()

gl_generator/generators/global_gen.rs

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

gl_generator/generators/mod.rs

@@ -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/registry/mod.rs

@@ -143,7 +143,7 @@ impl Registry {
             api,
             fallbacks,
             extensions,
-            version: format!("{}.{}", major, minor),
+            version: format!("{major}.{minor}"),
             profile,
         };
 

gl_generator/registry/parse.rs

@@ -111,7 +111,7 @@ fn profile_from_str(src: &str) -> Result<Profile, ()> {
 
 fn underscore_numeric_prefix(src: &str) -> String {
     match src.chars().next() {
-        Some(c) if c.is_numeric() => format!("_{}", src),
+        Some(c) if c.is_numeric() => format!("_{src}"),
         Some(_) | None => src.to_string(),
     }
 }
@@ -323,7 +323,7 @@ trait Parse: Sized + Iterator<Item = ParseEvent> {
                 },
 
                 ParseEvent::Start(ref name, ref attributes) if name == "feature" => {
-                    debug!("Parsing feature: {:?}", attributes);
+                    debug!("Parsing feature: {attributes:?}");
                     features.push(Feature::convert(&mut self, attributes));
                 },
 
@@ -361,11 +361,11 @@ trait Parse: Sized + Iterator<Item = ParseEvent> {
                 for remove in &feature.removes {
                     if remove.profile == filter.profile {
                         for enm in &remove.enums {
-                            debug!("Removing {}", enm);
+                            debug!("Removing {enm}");
                             desired_enums.remove(enm);
                         }
                         for cmd in &remove.commands {
-                            debug!("Removing {}", cmd);
+                            debug!("Removing {cmd}");
                             desired_cmds.remove(cmd);
                         }
                     }
@@ -464,16 +464,16 @@ trait Parse: Sized + Iterator<Item = ParseEvent> {
         two: &'a str,
         end: &'a str,
     ) -> (Vec<T>, Vec<U>) {
-        debug!("consume_two: looking for {} and {} until {}", one, two, end);
+        debug!("consume_two: looking for {one} and {two} until {end}");
 
         let mut ones = Vec::new();
         let mut twos = Vec::new();
 
         loop {
             match self.next().unwrap() {
                 ParseEvent::Start(ref name, ref attributes) => {
-                    debug!("Found start element <{:?} {:?}>", name, attributes);
-                    debug!("one and two are {} and {}", one, two);
+                    debug!("Found start element <{name:?} {attributes:?}>");
+                    debug!("one and two are {one} and {two}");
 
                     let n = name.clone();
 
@@ -492,7 +492,7 @@ trait Parse: Sized + Iterator<Item = ParseEvent> {
                     }
                 },
                 ParseEvent::End(ref name) => {
-                    debug!("Found end element </{:?}>", name);
+                    debug!("Found end element </{name:?}>");
 
                     if one == name || two == name {
                         continue;
@@ -736,7 +736,7 @@ impl FromXml for Feature {
         let name = get_attribute(a, "name").unwrap();
         let number = get_attribute(a, "number").unwrap();
 
-        debug!("Found api = {}, name = {}, number = {}", api, name, number);
+        debug!("Found api = {api}, name = {name}, number = {number}");
 
         let (require, remove) = parser.consume_two("require", "remove", "feature");
 

khronos_api/Cargo.toml

@@ -15,7 +15,7 @@ repository = "https://github.com/brendanzab/gl-rs/"
 readme = "README.md"
 
 # Only include what we need here. The git submodules are quite large, and would
-# exceed the maximimum crate size if we didn't do this
+# exceed the maximum crate size if we didn't do this
 include = [
   "/README.md",
   "/src/**/*",
@@ -30,3 +30,6 @@ include = [
 
 categories = ["rendering::graphics-api"]
 keywords = ["gl", "egl", "opengl", "khronos"]
+
+[lints]
+workspace = true

tests/test_add_registries/Cargo.toml

@@ -9,3 +9,6 @@ path = "lib.rs"
 
 [build-dependencies]
 gl_generator = { path = "../../gl_generator" }
+
+[lints]
+workspace = true