implement suggestions + cleanup

ctru-rs/examples/wifi-info.rs

@@ -1,8 +1,6 @@
 //! Wi-Fi info example
 //!
 //! This example prints out all the info about the console's network, like SSID, security, proxy info...
-//!
-//! ```
 
 use ctru::{prelude::*, services::ac::Ac};
 

ctru-rs/src/error.rs

@@ -94,6 +94,7 @@ pub enum Error {
         /// Size of the requested data (in bytes).
         wanted: usize,
     },
+    Utf8(std::string::FromUtf8Error),
 }
 
 impl Error {
@@ -127,6 +128,12 @@ impl From<ResultCode> for Error {
     }
 }
 
+impl From<std::string::FromUtf8Error> for Error {
+    fn from(err: std::string::FromUtf8Error) -> Self {
+        Error::Utf8(err)
+    }
+}
+
 impl fmt::Debug for Error {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match self {
@@ -146,6 +153,7 @@ impl fmt::Debug for Error {
                 .field("provided", provided)
                 .field("wanted", wanted)
                 .finish(),
+            Self::Utf8(e) => f.debug_tuple("Utf8").field(e).finish(),
         }
     }
 }
@@ -168,7 +176,8 @@ impl fmt::Display for Error {
             Self::OutputAlreadyRedirected => {
                 write!(f, "output streams are already redirected to 3dslink")
             }
-            Self::BufferTooShort{provided, wanted} => write!(f, "the provided buffer's length is too short (length = {provided}) to hold the wanted data (size = {wanted})")
+            Self::BufferTooShort{provided, wanted} => write!(f, "the provided buffer's length is too short (length = {provided}) to hold the wanted data (size = {wanted})"),
+            Self::Utf8(e) => write!(f, "UTF-8 conversion error: {e}")
         }
     }
 }

ctru-rs/src/services/ac.rs

@@ -1,8 +1,5 @@
 use crate::error::ResultCode;
-use crate::services::fs::FsMediaType;
-use std::ffi::CString;
-use std::io::Write;
-use std::marker::PhantomData;
+
 pub struct Ac(());
 
 impl Ac {
@@ -144,7 +141,7 @@ impl Ac {
             let mut vec = vec![0u8; len as usize];
             ResultCode(ctru_sys::ACU_GetSSID(vec.as_mut_ptr()))?;
             // how do i handle this error?
-            Ok(String::from_utf8(vec).unwrap())
+            Ok(String::from_utf8(vec)?)
         }
     }
 
@@ -235,7 +232,7 @@ impl Ac {
             ResultCode(ctru_sys::ACU_GetProxyUserName(vec.as_mut_ptr()))?;
 
             // how do i handle this error?
-            Ok(String::from_utf8(vec).unwrap())
+            Ok(String::from_utf8(vec)?)
         }
     }
 
@@ -266,7 +263,7 @@ impl Ac {
             ResultCode(ctru_sys::ACU_GetProxyPassword(vec.as_mut_ptr()))?;
 
             // how do i handle this error?
-            Ok(String::from_utf8(vec).unwrap())
+            Ok(String::from_utf8(vec)?)
         }
     }
 
@@ -309,6 +306,7 @@ impl Drop for Ac {
 #[doc(alias = "acSecurityMode")]
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 #[repr(u32)]
+#[non_exhaustive]
 pub enum SecurityMode {
     Open = 0,
     WEP40Bit = 1,