Merge pull request #62 from ian-h-chamberlain/must-use-bindgen

Generate #[must_use] on bindings that return a Result

Cargo.toml

@@ -1,9 +1,6 @@
 [workspace]
 members = ["ctru-rs", "ctru-sys"]
 
-[patch.'https://github.com/Meziu/libc']
-libc = "0.2.121"
-
 [patch.'https://github.com/Meziu/ctru-rs']
 # Make sure all dependencies use the local ctru-sys package
 ctru-sys = { path = "ctru-sys" }

ctru-rs/src/lib.rs

@@ -22,16 +22,22 @@ pub fn init() {
     linker_fix_3ds::init();
     pthread_3ds::init();
 
+    #[cfg(not(test))]
+    panic_hook_setup();
+
     // Initialize the PS service for random data generation
     unsafe {
-        ctru_sys::psInit();
+        let ps_ret = ctru_sys::psInit();
+        if ctru_sys::R_FAILED(ps_ret) {
+            panic!(
+                "Failed to initialize random data generation: {:?}",
+                Error::from(ps_ret)
+            )
+        }
 
         // Setup the deconstruction at the program's end
         libc::atexit(services_deinit);
     }
-
-    #[cfg(not(test))]
-    panic_hook_setup();
 }
 
 #[cfg(not(test))]

ctru-rs/src/services/fs.rs

@@ -996,7 +996,7 @@ impl Drop for Fs {
 impl Drop for Archive {
     fn drop(&mut self) {
         unsafe {
-            ctru_sys::FSUSER_CloseArchive(self.handle);
+            let _ = ctru_sys::FSUSER_CloseArchive(self.handle);
         }
     }
 }
@@ -1004,7 +1004,7 @@ impl Drop for Archive {
 impl Drop for File {
     fn drop(&mut self) {
         unsafe {
-            ctru_sys::FSFILE_Close(self.handle);
+            let _ = ctru_sys::FSFILE_Close(self.handle);
         }
     }
 }
@@ -1012,7 +1012,7 @@ impl Drop for File {
 impl Drop for Dir {
     fn drop(&mut self) {
         unsafe {
-            ctru_sys::FSDIR_Close(self.0);
+            let _ = ctru_sys::FSDIR_Close(self.0);
         }
     }
 }

ctru-rs/src/services/soc.rs

@@ -50,7 +50,7 @@ impl Soc {
             // Surely nothing bad will happens :D
             || unsafe {
                 // The socket buffer is freed automatically by `socExit`
-                ctru_sys::socExit();
+                let _ = ctru_sys::socExit();
             },
         )?;
 

ctru-sys/bindgen.sh

@@ -6,6 +6,7 @@ bindgen "$DEVKITPRO/libctru/include/3ds.h" \
     --rust-target nightly \
     --use-core \
     --distrust-clang-mangling \
+    --must-use-type 'Result' \
     --no-doc-comments \
     --no-layout-tests \
     --ctypes-prefix "::libc" \