refactor for nicer error message on missing bindings

need edition 2021 for panic message formatting

Author: antonilol

sdl2-sys/Cargo.toml

@@ -10,7 +10,7 @@ categories = ["rendering","external-ffi-bindings","game-engines","multimedia"]
 license = "MIT AND Zlib"
 links = "SDL2"
 build = "build.rs"
-edition = "2018"
+edition = "2021"
 
 [lib]
 name = "sdl2_sys"

sdl2-sys/build.rs

@@ -590,58 +590,40 @@ fn copy_pregenerated_bindings(target: &str) {
         target,
     );
 
-    fs::copy(
-        crate_path.join("sdl_bindings.rs"),
-        out_path.join("sdl_bindings.rs"),
-    )
-    .expect("Couldn't find pregenerated bindings!");
-
-    if cfg!(feature = "image") {
-        fs::copy(
-            crate_path.join("sdl_image_bindings.rs"),
-            out_path.join("sdl_image_bindings.rs"),
-        )
-        .expect("Couldn't find pregenerated SDL_image bindings!");
-    }
-    if cfg!(feature = "ttf") {
-        fs::copy(
-            crate_path.join("sdl_ttf_bindings.rs"),
-            out_path.join("sdl_ttf_bindings.rs"),
-        )
-        .expect("Couldn't find pregenerated SDL_ttf bindings!");
-    }
-    if cfg!(feature = "mixer") {
-        fs::copy(
-            crate_path.join("sdl_mixer_bindings.rs"),
-            out_path.join("sdl_mixer_bindings.rs"),
-        )
-        .expect("Couldn't find pregenerated SDL_mixer bindings!");
-    }
-
-    if cfg!(feature = "gfx") {
-        fs::copy(
-            crate_path.join("sdl_gfx_framerate_bindings.rs"),
-            out_path.join("sdl_gfx_framerate_bindings.rs"),
-        )
-        .expect("Couldn't find pregenerated SDL_gfx framerate bindings!");
-
-        fs::copy(
-            crate_path.join("sdl_gfx_primitives_bindings.rs"),
-            out_path.join("sdl_gfx_primitives_bindings.rs"),
-        )
-        .expect("Couldn't find pregenerated SDL_gfx primitives bindings!");
-
-        fs::copy(
-            crate_path.join("sdl_gfx_imagefilter_bindings.rs"),
-            out_path.join("sdl_gfx_imagefilter_bindings.rs"),
-        )
-        .expect("Couldn't find pregenerated SDL_gfx imagefilter bindings!");
-
-        fs::copy(
-            crate_path.join("sdl_gfx_rotozoom_bindings.rs"),
-            out_path.join("sdl_gfx_rotozoom_bindings.rs"),
-        )
-        .expect("Couldn't find pregenerated SDL_gfx rotozoom bindings!");
+    #[allow(unused_mut)]
+    let mut paths = vec!["sdl_bindings.rs"];
+
+    #[cfg(feature = "image")]
+    paths.push("sdl_image_bindings.rs");
+
+    #[cfg(feature = "ttf")]
+    paths.push("sdl_ttf_bindings.rs");
+
+    #[cfg(feature = "mixer")]
+    paths.push("sdl_mixer_bindings.rs");
+
+    #[cfg(feature = "gfx")]
+    paths.extend([
+        "sdl_gfx_framerate_bindings.rs",
+        "sdl_gfx_primitives_bindings.rs",
+        "sdl_gfx_imagefilter_bindings.rs",
+        "sdl_gfx_rotozoom_bindings.rs",
+    ]);
+
+    for path in paths {
+        let from = crate_path.join(path);
+        let to = out_path.join(path);
+        match fs::copy(&from, &to) {
+            Ok(_) => {}
+            Err(err) => {
+                panic!(
+                    "unable to copy {} to {}: {err}\n\n\n\
+                     Could not copy pregenerated bindings \"{path}\" for target \"{target}\": {err}.\n\
+                     If pregenerated bindings do not exist for your target, they can be generated by enabling the \"bindgen\" feature.\n\n",
+                    from.display(), to.display(),
+                );
+            }
+        }
     }
 }