Fix remaining lints by hand

Author: MarijnS95

gl/examples/basic.rs

@@ -34,7 +34,11 @@ fn main() {
         *control_flow = ControlFlow::Wait;
         match event {
             Event::LoopDestroyed => (),
-            Event::WindowEvent { event, .. } => if event == WindowEvent::CloseRequested { *control_flow = ControlFlow::Exit },
+            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

@@ -17,7 +17,6 @@ extern crate glutin;
 
 use gl::types::*;
 use std::ffi::CString;
-use std::mem;
 use std::ptr;
 use std::str;
 
@@ -57,20 +56,19 @@ fn compile_shader(src: &str, ty: GLenum) -> GLuint {
         // Fail on error
         if status != (gl::TRUE as GLint) {
             let mut len = 0;
+            let mut outlen = 0;
             gl::GetShaderiv(shader, gl::INFO_LOG_LENGTH, &mut len);
             let mut buf = Vec::with_capacity(len as usize);
-            buf.set_len((len as usize) - 1); // subtract 1 to skip the trailing null character
             gl::GetShaderInfoLog(
                 shader,
                 len,
-                ptr::null_mut(),
+                &mut outlen, // Number of characters written excluding null terminator
                 buf.as_mut_ptr() as *mut GLchar,
             );
+            buf.set_len(outlen as usize);
             panic!(
                 "{}",
-                str::from_utf8(&buf)
-                    .ok()
-                    .expect("ShaderInfoLog not valid utf8")
+                str::from_utf8(&buf).expect("ShaderInfoLog not valid utf8")
             );
         }
     }
@@ -89,21 +87,20 @@ fn link_program(vs: GLuint, fs: GLuint) -> GLuint {
 
         // Fail on error
         if status != (gl::TRUE as GLint) {
-            let mut len: GLint = 0;
+            let mut len = 0;
+            let mut outlen = 0;
             gl::GetProgramiv(program, gl::INFO_LOG_LENGTH, &mut len);
             let mut buf = Vec::with_capacity(len as usize);
-            buf.set_len((len as usize) - 1); // subtract 1 to skip the trailing null character
             gl::GetProgramInfoLog(
                 program,
                 len,
-                ptr::null_mut(),
+                &mut outlen, // Number of characters written excluding null terminator
                 buf.as_mut_ptr() as *mut GLchar,
             );
+            buf.set_len(outlen as usize);
             panic!(
                 "{}",
-                str::from_utf8(&buf)
-                    .ok()
-                    .expect("ProgramInfoLog not valid utf8")
+                str::from_utf8(&buf).expect("ProgramInfoLog not valid utf8")
             );
         }
         program
@@ -141,8 +138,8 @@ fn main() {
         gl::BindBuffer(gl::ARRAY_BUFFER, vbo);
         gl::BufferData(
             gl::ARRAY_BUFFER,
-            (VERTEX_DATA.len() * mem::size_of::<GLfloat>()) as GLsizeiptr,
-            mem::transmute(&VERTEX_DATA[0]),
+            size_of_val(&VERTEX_DATA) as GLsizeiptr,
+            VERTEX_DATA.as_ptr().cast(),
             gl::STATIC_DRAW,
         );
 
@@ -169,16 +166,18 @@ fn main() {
         *control_flow = ControlFlow::Wait;
         match event {
             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);
+            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
                 }
-                *control_flow = ControlFlow::Exit
             },
             Event::RedrawRequested(_) => {
                 unsafe {

gl/src/lib.rs

@@ -72,5 +72,16 @@
 
 #![crate_name = "gl"]
 #![crate_type = "lib"]
+#![allow(
+    clippy::missing_safety_doc,
+    clippy::missing_transmute_annotations,
+    clippy::too_many_arguments,
+    clippy::unused_unit
+)]
 
 include!(concat!(env!("OUT_DIR"), "/bindings.rs"));
+
+// #[test]
+// fn x() {
+//     ActiveShaderProgram()
+// }

gl_generator/generators/mod.rs

@@ -53,7 +53,7 @@ where
     writeln!(dest,
         "#[allow(dead_code, non_upper_case_globals)] pub const {ident}: {types_prefix}{ty} = {value}{cast_suffix};",
         ident = enm.ident,
-        types_prefix = if enm.ty == "&'static str" { "" } else { types_prefix },
+        types_prefix = if enm.ty == "&str" { "" } else { types_prefix },
         ty = enm.ty,
         value = enm.value,
         cast_suffix = match enm.cast {

gl_generator/registry/parse.rs

@@ -126,11 +126,7 @@ fn underscore_keyword(ident: String) -> String {
 }
 
 fn trim_str<'a>(s: &'a str, trim: &str) -> &'a str {
-    if s.starts_with(trim) {
-        &s[trim.len()..]
-    } else {
-        s
-    }
+    s.strip_prefix(trim).unwrap_or(s)
 }
 
 fn trim_enum_prefix(ident: &str, api: Api) -> String {
@@ -164,7 +160,7 @@ fn make_enum(ident: String, ty: Option<String>, value: String, alias: Option<Str
                 Some(ref ty) if ty == "u" => "GLuint",
                 Some(ref ty) if ty == "ull" => "GLuint64",
                 Some(ty) => panic!("Unhandled enum type: {}", ty),
-                None if value.starts_with("\"") => "&'static str",
+                None if value.starts_with("\"") => "&str",
                 None if ident == "TRUE" || ident == "FALSE" => "GLboolean",
                 None => "GLenum",
             };
@@ -246,7 +242,7 @@ fn merge_map(a: &mut BTreeMap<String, Vec<String>>, b: BTreeMap<String, Vec<Stri
 #[derive(Clone)]
 struct Feature {
     pub api: Api,
-    pub name: String,
+    pub _name: String,
     pub number: String,
     pub requires: Vec<Require>,
     pub removes: Vec<Remove>,
@@ -713,10 +709,7 @@ impl FromXml for Require {
     fn convert<P: Parse>(parser: &mut P, _: &[Attribute]) -> Require {
         debug!("Doing a FromXml on Require");
         let (enums, commands) = parser.consume_two("enum", "command", "require");
-        Require {
-            enums,
-            commands,
-        }
+        Require { enums, commands }
     }
 }
 
@@ -749,7 +742,7 @@ impl FromXml for Feature {
 
         Feature {
             api,
-            name,
+            _name: name,
             number,
             requires: require,
             removes: remove,

khronos_api/build.rs

@@ -38,7 +38,11 @@ fn main() {
     // The slice will have one entry for each WebGL extension. To find the
     // extensions we mirror the behaviour of the `api_webgl/extensions/find-exts`
     // shell script.
-    let mut paths: Vec<_> = root.read_dir().unwrap().map(|e| e.unwrap().path()).collect();
+    let mut paths: Vec<_> = root
+        .read_dir()
+        .unwrap()
+        .map(|e| e.unwrap().path())
+        .collect();
     // Sort the list of paths in order for the webgl_exts.rs file to be created
     // deterministically.
     paths.sort();

khronos_api/src/lib.rs

@@ -33,8 +33,7 @@ pub const GLX_XML: &[u8] = include_bytes!("../api/xml/glx.xml");
 pub const GL_ANGLE_EXT_XML: &[u8] = include_bytes!("../api_angle/scripts/gl_angle_ext.xml");
 
 /// The contents of [`egl_angle_ext.xml`](https://github.com/google/angle/blob/master/scripts/egl_angle_ext.xml)
-pub const EGL_ANGLE_EXT_XML: &[u8] =
-    include_bytes!("../api_angle/scripts/egl_angle_ext.xml");
+pub const EGL_ANGLE_EXT_XML: &[u8] = include_bytes!("../api_angle/scripts/egl_angle_ext.xml");
 
 /// The contents of [`webgl.idl`](https://github.com/KhronosGroup/WebGL/blob/master/specs/latest/1.0/webgl.idl)
 pub const WEBGL_IDL: &[u8] = include_bytes!("../api_webgl/specs/latest/1.0/webgl.idl");
@@ -44,5 +43,4 @@ pub const WEBGL2_IDL: &[u8] = include_bytes!("../api_webgl/specs/latest/2.0/webg
 
 /// The contents of the WebGL extension XML files
 /// These are discovered via a build script to avoid having to list each extension by name.
-pub const WEBGL_EXT_XML: &[&[u8]] =
-    include!(concat!(env!("OUT_DIR"), "/webgl_exts.rs"));
+pub const WEBGL_EXT_XML: &[&[u8]] = include!(concat!(env!("OUT_DIR"), "/webgl_exts.rs"));

tests/test_add_registries/lib.rs

@@ -13,5 +13,11 @@
 // limitations under the License.
 
 pub mod gl {
+    #![allow(
+        clippy::missing_safety_doc,
+        clippy::missing_transmute_annotations,
+        clippy::too_many_arguments,
+        clippy::unused_unit
+    )]
     include!(concat!(env!("OUT_DIR"), "/test_add_registries.rs"));
 }

tests/test_gen_symbols/lib.rs

@@ -12,6 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#![allow(
+    clippy::missing_transmute_annotations,
+    clippy::too_many_arguments,
+    clippy::unused_unit,
+    clippy::upper_case_acronyms
+)]
+
 use std::os::raw;
 
 include!(concat!(env!("OUT_DIR"), "/test_gen_symbols.rs"));
@@ -54,18 +61,14 @@ pub fn compile_test_glsc2() {
 
 pub fn compile_test_glx() {
     unsafe {
-        let _ = glx::GetProcAddress(std::mem::MaybeUninit::uninit().assume_init());
-        glx::SwapBuffers(
-            std::mem::MaybeUninit::uninit().assume_init(),
-            std::mem::MaybeUninit::uninit().assume_init(),
-        );
+        let _ = glx::GetProcAddress(std::ptr::null());
+        glx::SwapBuffers(std::ptr::null_mut(), 0);
     }
 }
 
 pub fn compile_test_wgl() {
     unsafe {
-        let _: wgl::types::HGLRC =
-            wgl::CreateContext(std::mem::MaybeUninit::uninit().assume_init());
+        let _: wgl::types::HGLRC = wgl::CreateContext(std::ptr::null());
     }
 }
 
@@ -84,6 +87,6 @@ pub fn compile_test_egl() {
         ];
 
         let _ = egl::GetDisplay(egl::DEFAULT_DISPLAY);
-        egl::Terminate(std::mem::MaybeUninit::uninit().assume_init());
+        egl::Terminate(std::ptr::null());
     }
 }

tests/test_no_warnings/lib.rs

@@ -14,5 +14,18 @@
 
 //! Making sure that no warning is generated by code from generate_gl_bindings!
 #![deny(warnings)]
+#![allow(
+    // Allow clashing definitions because we're pasting and testing all APIs at once (with
+    // references to different types).
+    clashing_extern_declarations,
+
+    unused_imports,
+    clippy::let_and_return,
+    clippy::let_unit_value,
+    clippy::missing_transmute_annotations,
+    clippy::too_many_arguments,
+    clippy::unused_unit,
+    clippy::upper_case_acronyms,
+)]
 
 include!(concat!(env!("OUT_DIR"), "/test_no_warnings.rs"));