Regenerate bindings with bindgen 0.66.1

build.rs

@@ -4,9 +4,12 @@
 
 fn main() {
     let mut build = cc::Build::new();
-
+
+    println!("cargo:rerun-if-changed=src/stb_image.c");
+
     build
         .cpp(true)
+        .define("STB_IMAGE_IMPLEMENTATION", None)
         .file("src/stb_image.c");
 
     build.compile("libstb_image");

gen.sh

@@ -2,5 +2,4 @@
 if test "x$BINDGEN" == "x"; then
     BINDGEN=bindgen
 fi
-$BINDGEN -DSTBI_HEADER_FILE_ONLY -match stb_image -o stb_image.rs stb_image.c
-
+$BINDGEN --no-layout-tests --allowlist-function "stbi_.*" -o src/stb_image.rs src/stb_image.c

src/image.rs

@@ -7,7 +7,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use stb_image::bindgen::*;
+use stb_image::*;
 
 use libc::{c_int, c_void};
 use std::convert::AsRef;
@@ -25,10 +25,10 @@ pub struct Image<T> {
 impl<T> Image<T> {
     pub fn new(width: usize, height: usize, depth: usize, data: Vec<T>) -> Image<T> {
         Image::<T> {
-            width: width,
-            height: height,
-            depth: depth,
-            data: data,
+            width,
+            height,
+            depth,
+            data,
         }
     }
 }
@@ -54,7 +54,7 @@ fn load_internal<T: Clone>(buf: *mut T, w: c_int, h: c_int, d: c_int) -> Image<T
             width: w as usize,
             height: h as usize,
             depth: d as usize,
-            data: data,
+            data,
         }
     }
 }

src/lib.rs

@@ -7,10 +7,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![crate_name = "stb_image"]
-#![crate_type = "rlib"]
-
 extern crate libc;
 
 pub mod image;
+
+#[allow(non_snake_case, non_camel_case_types)]
 pub mod stb_image;