remove unused dependencies (deltaphc#94)

* remove raylib src directory copy to out dir

* fix callback.rs not compiling due to inline-const experimental

* remove libc dependency refactor:
libc::c_void -> std::is::raw:::c_void
libc::malloc -> ffi::MemAlloc (using raylibs bindings to malloc instead)

* removed unused crate lazy_static
remove unused crate parking_lot
make specs-derive optional
remove arr_macro which was only needed for the examples

* make specs an optional dependency

* bump bindgen 0.69 -> 0.70

* raylib-sys remove fs_extra dependency
update cmake 0.1.49 -> 0.1.51

* remove arr_macro from samples
fix 3d_camera_first_person to compile

Author: jestarray

raylib-sys/Cargo.toml

@@ -12,10 +12,9 @@ edition = "2018"
 exclude = ["raylib/examples/*", "raylib/projects/*", "raylib/templates/*"]
 
 [build-dependencies]
-fs_extra = "1.2"
-cmake = "0.1.49"
+cmake = "0.1.51"
 cc = "1.0"
-bindgen = "0.69.0"
+bindgen = "0.70"
 
 [features]
 default = []

raylib-sys/build.rs

@@ -128,10 +128,7 @@ fn build_with_cmake(src_path: &str) {
 
     // Allows disabling the default maping of screenshot and gif recording in raylib
     {
-        #[cfg(any(
-                    feature = "noscreenshot",
-                    feature = "nogif"
-        ))]
+        #[cfg(any(feature = "noscreenshot", feature = "nogif"))]
         builder.define("CUSTOMIZE_BUILD", "ON");
 
         #[cfg(feature = "noscreenshot")]
@@ -333,9 +330,11 @@ fn main() {
     }
     let (platform, platform_os) = platform_from_target(&target);
 
-    // Donwload raylib source
-    let src = cp_raylib();
-    build_with_cmake(&src);
+    let raylib_src = "./raylib";
+    if is_directory_empty(raylib_src) {
+        panic!("raylib source does not exist in: `raylib-sys/raylib`. Please copy it in");
+    }
+    build_with_cmake(raylib_src);
 
     gen_bindings();
 
@@ -344,17 +343,13 @@ fn main() {
     gen_rgui();
 }
 
-// cp_raylib copy raylib to an out dir
-fn cp_raylib() -> String {
-    let out = env::var("OUT_DIR").unwrap();
-    let out = Path::new(&out); //.join("raylib_source");
-
-    let mut options = fs_extra::dir::CopyOptions::new();
-    options.skip_exist = true;
-    fs_extra::dir::copy("raylib", out, &options)
-        .unwrap_or_else(|_| panic!("failed to copy raylib source to {}", &out.to_string_lossy()));
-
-    out.join("raylib").to_string_lossy().to_string()
+#[must_use]
+/// returns false if the directory does not exist
+fn is_directory_empty(path: &str) -> bool {
+    match std::fs::read_dir(path) {
+        Ok(mut dir) => dir.next().is_none(),
+        Err(_) => true,
+    }
 }
 
 // run_command runs a command to completion or panics. Used for running curl and powershell.

raylib/Cargo.toml

@@ -14,26 +14,19 @@ autoexamples = false
 
 [dependencies]
 raylib-sys = { version = "5.5.0", path = "../raylib-sys" }
-libc = "0.2.45"
-lazy_static = "1.2.0"
 cfg-if = "1.0.0"
 serde = { version = "1.0.125", features = ["derive"], optional = true }
 serde_json = { version = "1.0.64", optional = true }
 
 mint = { version = "0.5.9", optional = true }
-parking_lot = "0.12.1"
 
-specs-derive = "0.4.1"
+specs = { version = "0.16.1", default = false, optional = true }
+specs-derive = { version = "0.4.1", optional = true }
 thiserror = "1.0.61"
 
 [dev-dependencies]
 structopt = "0.3"
 rand = "0.8.5"
-arr_macro = "0.1.3"
-
-[dependencies.specs]
-version = "0.16.1"
-default-features = false
 
 [features]
 nightly = []

raylib/src/core/callbacks.rs

@@ -32,37 +32,37 @@ static LOAD_FILE_TEXT_CALLBACK: AtomicUsize = AtomicUsize::new(0);
 static AUDIO_STREAM_CALLBACK: AtomicUsize = AtomicUsize::new(0);
 
 fn trace_log_callback() -> Option<RustTraceLogCallback> {
-    const { assert!(size_of::<RustTraceLogCallback>() == size_of::<usize>()) };
+    debug_assert!(size_of::<RustTraceLogCallback>() == size_of::<usize>());
     unsafe { transmute(TRACE_LOG_CALLBACK.load(Ordering::Relaxed)) }
 }
 
 fn save_file_data_callback() -> Option<RustSaveFileDataCallback> {
-    const { assert!(size_of::<RustSaveFileDataCallback>() == size_of::<usize>()) };
+    debug_assert!(size_of::<RustSaveFileDataCallback>() == size_of::<usize>());
     unsafe { transmute(SAVE_FILE_DATA_CALLBACK.load(Ordering::Relaxed)) }
 }
 
 fn load_file_data_callback() -> Option<RustLoadFileDataCallback> {
-    const { assert!(size_of::<RustLoadFileDataCallback>() == size_of::<usize>()) };
+    debug_assert!(size_of::<RustLoadFileDataCallback>() == size_of::<usize>());
     unsafe { transmute(LOAD_FILE_DATA_CALLBACK.load(Ordering::Relaxed)) }
 }
 
 fn save_file_text_callback() -> Option<RustSaveFileTextCallback> {
-    const { assert!(size_of::<RustSaveFileTextCallback>() == size_of::<usize>()) };
+    debug_assert!(size_of::<RustSaveFileTextCallback>() == size_of::<usize>());
     unsafe { transmute(SAVE_FILE_TEXT_CALLBACK.load(Ordering::Relaxed)) }
 }
 
 fn load_file_text_callback() -> Option<RustLoadFileTextCallback> {
-    const { assert!(size_of::<RustLoadFileTextCallback>() == size_of::<usize>()) };
+    debug_assert!(size_of::<RustLoadFileTextCallback>() == size_of::<usize>());
     unsafe { transmute(LOAD_FILE_TEXT_CALLBACK.load(Ordering::Relaxed)) }
 }
 
 fn audio_stream_callback() -> Option<RustAudioStreamCallback> {
-    const { assert!(size_of::<RustAudioStreamCallback>() == size_of::<usize>()) };
+    debug_assert!(size_of::<RustAudioStreamCallback>() == size_of::<usize>());
     unsafe { transmute(AUDIO_STREAM_CALLBACK.load(Ordering::Relaxed)) }
 }
 
 #[no_mangle]
-pub extern "C" fn custom_trace_log_callback(level: TraceLogLevel, text: *const c_char) {
+pub unsafe extern "C" fn custom_trace_log_callback(level: TraceLogLevel, text: *const c_char) {
     if let Some(trace_log) = trace_log_callback() {
         let text = if text.is_null() {
             Cow::Borrowed("(MESSAGE WAS NULL)")

raylib/src/core/models.rs

@@ -100,7 +100,7 @@ impl RaylibHandle {
             }
         }
         unsafe {
-            ffi::MemFree(m_ptr as *mut libc::c_void);
+            ffi::MemFree(m_ptr as *mut ::std::os::raw::c_void);
         }
         Ok(m_vec)
     }
@@ -470,7 +470,7 @@ impl Material {
             }
         }
         unsafe {
-            ffi::MemFree(m_ptr as *mut libc::c_void);
+            ffi::MemFree(m_ptr as *mut ::std::os::raw::c_void);
         }
         Ok(m_vec)
     }

raylib/src/core/text.rs

@@ -9,7 +9,7 @@ use crate::error::{error, Error};
 use crate::ffi;
 use crate::math::Rectangle;
 
-use std::convert::{AsMut, AsRef};
+use std::convert::{AsMut, AsRef, TryInto};
 use std::ffi::{CString, OsString};
 use std::mem::ManuallyDrop;
 use std::ops::Deref;
@@ -371,7 +371,7 @@ impl Font {
         unsafe {
             self.glyphCount = chars.len() as i32;
             let data_size = self.glyphCount as usize * std::mem::size_of::<ffi::GlyphInfo>();
-            let ci_arr_ptr = libc::malloc(data_size); // raylib frees this data in UnloadFont
+            let ci_arr_ptr = ffi::MemAlloc(data_size.try_into().unwrap()); // raylib frees this data in UnloadFont
             std::ptr::copy(
                 chars.as_ptr(),
                 ci_arr_ptr as *mut ffi::GlyphInfo,
@@ -415,7 +415,7 @@ pub fn gen_image_font_atlas(
         #[allow(clippy::uninit_vec)]
         recs.set_len(chars.len());
         std::ptr::copy(ptr, recs.as_mut_ptr(), chars.len());
-        ffi::MemFree(ptr as *mut libc::c_void);
+        ffi::MemFree(ptr as *mut ::std::os::raw::c_void);
         return (img, recs);
     }
 }

samples/3d_camera_first_person.rs

@@ -1,10 +1,10 @@
-use arr_macro::arr;
 use rand::prelude::*;
 use raylib::prelude::*;
 
 const WINDOW_WIDTH: i32 = 1280;
 const WINDOW_HEIGHT: i32 = 720;
 
+#[derive(Copy, Clone, Default)]
 struct Column {
     height: f32,
     position: Vector3,
@@ -14,13 +14,13 @@ struct Column {
 impl Column {
     fn create_random() -> Column {
         let mut rng = rand::thread_rng();
-        let height: f32 = rng.gen_range(1.0, 12.0);
+        let height: f32 = rng.gen_range(1.0..12.0);
         let position = Vector3::new(
-            rng.gen_range(-15.0, 15.0),
+            rng.gen_range(-15.0..15.0),
             height / 2.0,
-            rng.gen_range(-15.0, 15.0),
+            rng.gen_range(-15.0..15.0),
         );
-        let color = Color::new(rng.gen_range(20, 255), rng.gen_range(10, 55), 30, 255);
+        let color = Color::new(rng.gen_range(20..255), rng.gen_range(10..55), 30, 255);
 
         Column {
             height,
@@ -42,7 +42,10 @@ fn main() {
         Vector3::new(0.0, 1.0, 0.0),
         60.0,
     );
-    let columns: [Column; 20] = arr![Column::create_random(); 20];
+    let mut columns = [Column::default(); 20];
+    for col in columns.iter_mut() {
+        *col = Column::create_random();
+    }
 
     rl.set_target_fps(60);
 

samples/Cargo.toml

@@ -16,7 +16,6 @@ rand = "0.7"
 #tcod = "0.14"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-arr_macro = "0.1.3"
 
 [dependencies.specs]
 version = "0.16.1"