Revert accidental formatting changes

ctru-rs/examples/audio-filters.rs

@@ -8,8 +8,10 @@ use std::f32::consts::PI;
 
 use ctru::linear::LinearAllocator;
 use ctru::prelude::*;
-use ctru::services::ndsp::wave::{Status, Wave};
+use ctru::services::ndsp::{
-use ctru::services::ndsp::{AudioFormat, AudioMix, InterpolationType, Ndsp, OutputMode};
+    wave::{Status, Wave},
+    AudioFormat, AudioMix, InterpolationType, Ndsp, OutputMode,
+};
 
 // Configuration for the NDSP process and channels.
 const SAMPLE_RATE: usize = 22050;

ctru-rs/examples/camera-image.rs

@@ -2,13 +2,13 @@
 //!
 //! This example demonstrates how to use the built-in cameras to take a picture and display it to the screen.
 
-use std::time::Duration;
-
 use ctru::prelude::*;
 use ctru::services::cam::{Cam, Camera, OutputFormat, ShutterSound, ViewSize};
 use ctru::services::gfx::{Flush, Screen, Swap};
 use ctru::services::gspgpu::FramebufferFormat;
 
+use std::time::Duration;
+
 const WIDTH: usize = 400;
 const HEIGHT: usize = 240;
 

ctru-rs/examples/file-explorer.rs

@@ -3,13 +3,13 @@
 //! This (rather complex) example creates a working text-based file explorer which shows off using standard library file system APIs to
 //! read the SD card and RomFS (if properly read via the `romfs:/` prefix).
 
+use ctru::applets::swkbd::{Button, SoftwareKeyboard};
+use ctru::prelude::*;
+
 use std::fs::DirEntry;
 use std::os::horizon::fs::MetadataExt;
 use std::path::{Path, PathBuf};
 
-use ctru::applets::swkbd::{Button, SoftwareKeyboard};
-use ctru::prelude::*;
-
 fn main() {
     ctru::use_panic_handler();
 

ctru-rs/examples/futures-basic.rs

@@ -7,10 +7,10 @@
 
 #![feature(horizon_thread_ext)]
 
-use std::os::horizon::thread::BuilderExt;
-
 use ctru::prelude::*;
+
 use futures::StreamExt;
+use std::os::horizon::thread::BuilderExt;
 
 fn main() {
     ctru::use_panic_handler();

ctru-rs/examples/futures-tokio.rs

@@ -1,10 +1,10 @@
 #![feature(horizon_thread_ext)]
 
+use ctru::prelude::*;
+
 use std::os::horizon::thread::BuilderExt;
 use std::time::Duration;
 
-use ctru::prelude::*;
-
 fn main() {
     ctru::use_panic_handler();
 

ctru-rs/examples/hello-world.rs

@@ -2,9 +2,8 @@
 //!
 //! Simple "Hello World" application to showcase the basic setup needed for any user-oriented app to work.
 
-use std::io::BufWriter;
-
 use ctru::prelude::*;
+use std::io::BufWriter;
 
 fn main() {
     // Setup the custom panic handler in case any errors arise.

ctru-rs/examples/network-sockets.rs

@@ -2,12 +2,12 @@
 //!
 //! This example showcases the use of network sockets via the `Soc` service and the standard library's implementations.
 
+use ctru::prelude::*;
+
 use std::io::{self, Read, Write};
 use std::net::{Shutdown, TcpListener};
 use std::time::Duration;
 
-use ctru::prelude::*;
-
 fn main() {
     ctru::use_panic_handler();
 

ctru-rs/examples/thread-basic.rs

@@ -1,10 +1,10 @@
 #![feature(horizon_thread_ext)]
 
+use ctru::prelude::*;
+
 use std::os::horizon::thread::BuilderExt;
 use std::time::Duration;
 
-use ctru::prelude::*;
-
 fn main() {
     ctru::use_panic_handler();
 

ctru-rs/examples/thread-info.rs

@@ -2,10 +2,10 @@
 
 #![feature(horizon_thread_ext)]
 
-use std::os::horizon::thread::BuilderExt;
-
 use ctru::prelude::*;
 
+use std::os::horizon::thread::BuilderExt;
+
 fn main() {
     ctru::use_panic_handler();
 

ctru-rs/examples/thread-locals.rs

@@ -1,10 +1,10 @@
 #![feature(horizon_thread_ext)]
 
+use ctru::prelude::*;
+
 use std::cell::RefCell;
 use std::os::horizon::thread::BuilderExt;
 
-use ctru::prelude::*;
-
 std::thread_local! {
     static MY_LOCAL: RefCell<&'static str> = RefCell::new("initial value");
 }

ctru-rs/src/applets/mii_selector.rs

@@ -3,12 +3,9 @@
 //! This applet opens a window which lets the player/user choose a Mii from the ones present on their console.
 //! The selected Mii is readable as a [`Mii`](crate::mii::Mii).
 
-use std::ffi::CString;
-use std::fmt;
-
-use bitflags::bitflags;
-
 use crate::mii::Mii;
+use bitflags::bitflags;
+use std::{ffi::CString, fmt};
 
 /// Index of a Mii on the [`MiiSelector`] interface.
 ///
@@ -100,8 +97,7 @@ impl MiiSelector {
     ///
     /// # Example
     ///
-    /// ```
+    /// ```no_run
-    /// # let _runner = test_runner::GdbRunner::default();
     /// # fn main() {
     /// use ctru::applets::mii_selector::MiiSelector;
     ///
@@ -125,8 +121,7 @@ impl MiiSelector {
     ///
     /// # Example
     ///
-    /// ```
+    /// ```no_run
-    /// # let _runner = test_runner::GdbRunner::default();
     /// # fn main() {
     /// use ctru::applets::mii_selector::{MiiSelector, Options};
     /// let mut mii_selector = MiiSelector::new();
@@ -150,8 +145,7 @@ impl MiiSelector {
     ///
     /// # Example
     ///
-    /// ```
+    /// ```no_run
-    /// # let _runner = test_runner::GdbRunner::default();
     /// # fn main() {
     /// #
     /// use ctru::applets::mii_selector::{Index, MiiSelector};
@@ -180,8 +174,7 @@ impl MiiSelector {
     ///
     /// # Example
     ///
-    /// ```
+    /// ```no_run
-    /// # let _runner = test_runner::GdbRunner::default();
     /// # fn main() {
     /// #
     /// use ctru::applets::mii_selector::{Index, MiiSelector};
@@ -205,8 +198,7 @@ impl MiiSelector {
     ///
     /// # Example
     ///
-    /// ```
+    /// ```no_run
-    /// # let _runner = test_runner::GdbRunner::default();
     /// # fn main() {
     /// #
     /// use ctru::applets::mii_selector::{Index, MiiSelector};
@@ -230,8 +222,7 @@ impl MiiSelector {
     ///
     /// # Example
     ///
-    /// ```
+    /// ```no_run
-    /// # let _runner = test_runner::GdbRunner::default();
     /// # fn main() {
     /// #
     /// use ctru::applets::mii_selector::{Index, MiiSelector};
@@ -269,8 +260,7 @@ impl MiiSelector {
     ///
     /// # Example
     ///
-    /// ```
+    /// ```no_run
-    /// # let _runner = test_runner::GdbRunner::default();
     /// # use std::error::Error;
     /// # fn main() -> Result<(), Box<dyn Error>> {
     /// #

ctru-rs/src/applets/swkbd.rs

@@ -5,15 +5,14 @@
 // TODO: Split the Parental PIN lock operations into a different type.
 #![doc(alias = "keyboard")]
 
-use std::fmt::Display;
-use std::iter::once;
-use std::str;
-
 use bitflags::bitflags;
 use ctru_sys::{
     self, swkbdInit, swkbdInputText, swkbdSetButton, swkbdSetFeatures, swkbdSetHintText, SwkbdState,
 };
 use libc;
+use std::fmt::Display;
+use std::iter::once;
+use std::str;
 
 /// Configuration structure to setup the Software Keyboard applet.
 #[doc(alias = "SwkbdState")]

ctru-rs/src/error.rs

@@ -3,9 +3,10 @@
 //! This module holds the generic error and result types to interface with `ctru_sys` and the [`ctru-rs`](crate) safe wrapper.
 
 use std::borrow::Cow;
+use std::error;
 use std::ffi::CStr;
+use std::fmt;
 use std::ops::{ControlFlow, FromResidual, Try};
-use std::{error, fmt};
 
 use ctru_sys::result::{R_DESCRIPTION, R_LEVEL, R_MODULE, R_SUMMARY};
 

ctru-rs/src/lib.rs

@@ -76,9 +76,8 @@ pub fn use_panic_handler() {
 /// When `test` is enabled, this function will be ignored.
 #[cfg(not(test))]
 fn panic_hook_setup() {
-    use std::panic::PanicInfo;
-
     use crate::services::hid::{Hid, KeyPad};
+    use std::panic::PanicInfo;
 
     let main_thread = std::thread::current().id();
 

ctru-rs/src/prelude.rs

@@ -3,7 +3,9 @@
 //! Particularly useful when writing very small applications.
 
 pub use crate::console::Console;
-pub use crate::services::apt::Apt;
+pub use crate::services::{
-pub use crate::services::gfx::Gfx;
+    apt::Apt,
-pub use crate::services::hid::{Hid, KeyPad};
+    gfx::Gfx,
-pub use crate::services::soc::Soc;
+    hid::{Hid, KeyPad},
+    soc::Soc,
+};

ctru-rs/src/services/am.rs

@@ -8,10 +8,9 @@
 #![doc(alias = "app")]
 #![doc(alias = "manager")]
 
-use std::marker::PhantomData;
-
 use crate::error::ResultCode;
 use crate::services::fs::FsMediaType;
+use std::marker::PhantomData;
 
 /// General information about a specific title entry.
 #[doc(alias = "AM_TitleEntry")]

ctru-rs/src/services/cam.rs

@@ -4,12 +4,10 @@
 //! in the form of byte vectors which can be displayed to the screen or used in other ways.
 #![doc(alias = "camera")]
 
-use std::time::Duration;
-
-use ctru_sys::Handle;
-
 use crate::error::{Error, ResultCode};
 use crate::services::gspgpu::FramebufferFormat;
+use ctru_sys::Handle;
+use std::time::Duration;
 
 /// Handle to the Camera service.
 #[non_exhaustive]
@@ -864,7 +862,7 @@ pub trait Camera {
     /// inward.set_auto_white_balance(true)?;
     ///
     /// // Size of the top screen buffer at 2 bytes per pixel (RGB565).
-    /// let mut buffer = vec![0; 400 * 240 * 2];
+    /// let mut buffer = vec![0; 400*240*2];
     ///
     /// // Take picture with 3 seconds of timeout.
     /// inward.take_picture(&mut buffer, 400, 240, Duration::from_secs(3));

ctru-rs/src/services/fs.rs

@@ -5,15 +5,17 @@
 // TODO: Refactor service to accomodate for various changes (such as SMDH support). Properly document the public API.
 #![doc(alias = "filesystem")]
 
+use bitflags::bitflags;
 use std::ffi::OsString;
-use std::io::{
+use std::io::Error as IoError;
-    Error as IoError, ErrorKind as IoErrorKind, Read, Result as IoResult, Seek, SeekFrom, Write,
+use std::io::ErrorKind as IoErrorKind;
-};
+use std::io::Result as IoResult;
+use std::io::{Read, Seek, SeekFrom, Write};
+use std::mem;
 use std::path::{Path, PathBuf};
+use std::ptr;
+use std::slice;
 use std::sync::Arc;
-use std::{mem, ptr, slice};
-
-use bitflags::bitflags;
 use widestring::{WideCStr, WideCString};
 
 bitflags! {
@@ -259,8 +261,8 @@ pub struct Metadata {
 /// let mut fs = Fs::new().unwrap();
 /// let mut sdmc_archive = fs.sdmc().unwrap();
 /// let result = OpenOptions::new()
-///     .read(true)
+///             .read(true)
-///     .archive(&sdmc_archive)
+///             .archive(&sdmc_archive)
 ///     .open("foo.txt");
 ///
 /// assert!(result.is_err());
@@ -276,12 +278,12 @@ pub struct Metadata {
 /// let mut fs = Fs::new().unwrap();
 /// let mut sdmc_archive = fs.sdmc().unwrap();
 /// let file = OpenOptions::new()
-///     .read(true)
+///             .read(true)
-///     .write(true)
+///             .write(true)
-///     .create(true)
+///             .create(true)
-///     .archive(&sdmc_archive)
+///             .archive(&sdmc_archive)
 ///     .open("/foo.txt")
-///     .unwrap();
+///             .unwrap();
 /// ```
 #[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
 pub struct OpenOptions {
@@ -392,7 +394,7 @@ impl File {
     /// # let _runner = test_runner::GdbRunner::default();
     /// use ctru::services::fs::{File, Fs};
     ///
-    /// let mut fs = Fs::new().unwrap();
+    /// let mut fs =  Fs::new().unwrap();
     /// let mut sdmc_archive = fs.sdmc().unwrap();
     /// // Non-existent file:
     /// assert!(File::open(&sdmc_archive, "/foo.txt").is_err());
@@ -421,7 +423,7 @@ impl File {
     /// # let _runner = test_runner::GdbRunner::default();
     /// use ctru::services::fs::{File, Fs};
     ///
-    /// let mut fs = Fs::new().unwrap();
+    /// let mut fs =  Fs::new().unwrap();
     /// let mut sdmc_archive = fs.sdmc().unwrap();
     /// let mut f = File::create(&mut sdmc_archive, "/foo.txt").unwrap();
     /// ```

ctru-rs/src/services/hid.rs

@@ -7,9 +7,8 @@
 #![doc(alias = "controller")]
 #![doc(alias = "gamepad")]
 
-use bitflags::bitflags;
-
 use crate::error::ResultCode;
+use bitflags::bitflags;
 
 bitflags! {
     /// A set of flags corresponding to the button and directional pad inputs present on the 3DS.

ctru-rs/src/services/ndsp/mod.rs

@@ -15,16 +15,17 @@
 // https://github.com/citra-emu/citra/issues/6111
 
 pub mod wave;
-use std::cell::{RefCell, RefMut};
-use std::default::Default;
-use std::sync::Mutex;
-use std::{error, fmt};
-
 use wave::{Status, Wave};
 
 use crate::error::ResultCode;
 use crate::services::ServiceReference;
 
+use std::cell::{RefCell, RefMut};
+use std::default::Default;
+use std::error;
+use std::fmt;
+use std::sync::Mutex;
+
 const NUMBER_OF_CHANNELS: u8 = 24;
 
 /// Audio output mode.

ctru-rs/src/services/ndsp/wave.rs

@@ -42,8 +42,7 @@ impl Wave {
     /// # let _runner = test_runner::GdbRunner::default();
     /// #
     /// use ctru::linear::LinearAllocator;
-    /// use ctru::services::ndsp::wave::Wave;
+    /// use ctru::services::ndsp::{AudioFormat, wave::Wave};
-    /// use ctru::services::ndsp::AudioFormat;
     ///
     /// // Zeroed box allocated in the LINEAR memory.
     /// let audio_data = Box::new_in([0u8; 96], LinearAllocator);
@@ -120,8 +119,7 @@ impl Wave {
     /// # use ctru::linear::LinearAllocator;
     /// # let _audio_data = Box::new_in([0u8; 96], LinearAllocator);
     /// #
-    /// use ctru::services::ndsp::wave::{Status, Wave};
+    /// use ctru::services::ndsp::{AudioFormat, wave::{Wave, Status}};
-    /// use ctru::services::ndsp::AudioFormat;
     ///
     /// // Provide your own audio data.
     /// let wave = Wave::new(_audio_data, AudioFormat::PCM16Stereo, false);

ctru-rs/src/services/reference.rs

@@ -1,6 +1,5 @@
-use std::sync::Mutex;
-
 use crate::Error;
+use std::sync::Mutex;
 pub(crate) struct ServiceReference {
     counter: &'static Mutex<usize>,
     close: Box<dyn Fn() + Send + Sync>,

ctru-rs/src/services/romfs.rs

@@ -27,10 +27,10 @@
 #![doc(alias = "embed")]
 #![doc(alias = "filesystem")]
 
+use crate::error::ResultCode;
 use std::ffi::CStr;
 use std::sync::Mutex;
 
-use crate::error::ResultCode;
 use crate::services::ServiceReference;
 
 /// Handle to the RomFS service.

ctru-rs/src/services/soc.rs

@@ -5,11 +5,10 @@
 #![doc(alias = "socket")]
 #![doc(alias = "network")]
 
+use libc::memalign;
 use std::net::Ipv4Addr;
 use std::sync::Mutex;
 
-use libc::memalign;
-
 use crate::error::ResultCode;
 use crate::services::ServiceReference;
 use crate::Error;