Prelude module addition

ctru-rs/examples/buttons.rs

@@ -1,7 +1,4 @@
-use ctru::console::Console;
+use ctru::prelude::*;
-use ctru::gfx::Gfx;
-use ctru::services::apt::Apt;
-use ctru::services::hid::{Hid, KeyPad};
 
 fn main() {
     // Setup services

ctru-rs/examples/file-explorer.rs

@@ -2,10 +2,8 @@
 //! read the SD card.
 
 use ctru::applets::swkbd::{Button, Swkbd};
-use ctru::console::Console;
+use ctru::prelude::*;
-use ctru::services::hid::KeyPad;
+
-use ctru::services::{Apt, Hid};
-use ctru::Gfx;
 use std::fs::DirEntry;
 use std::os::horizon::fs::MetadataExt;
 use std::path::{Path, PathBuf};

ctru-rs/examples/futures-basic.rs

@@ -7,10 +7,8 @@
 
 #![feature(horizon_thread_ext)]
 
-use ctru::console::Console;
+use ctru::prelude::*;
-use ctru::services::hid::KeyPad;
+
-use ctru::services::{Apt, Hid};
-use ctru::Gfx;
 use futures::StreamExt;
 use std::os::horizon::thread::BuilderExt;
 

ctru-rs/examples/futures-tokio.rs

@@ -1,9 +1,7 @@
 #![feature(horizon_thread_ext)]
 
-use ctru::console::Console;
+use ctru::prelude::*;
-use ctru::services::hid::KeyPad;
+
-use ctru::services::{Apt, Hid};
-use ctru::Gfx;
 use std::os::horizon::thread::BuilderExt;
 use std::time::Duration;
 

ctru-rs/examples/gfx-wide-mode.rs

@@ -1,7 +1,4 @@
-use ctru::console::Console;
+use ctru::prelude::*;
-use ctru::services::hid::KeyPad;
-use ctru::services::{Apt, Hid};
-use ctru::Gfx;
 
 fn main() {
     ctru::init();

ctru-rs/examples/graphics-bitmap.rs

@@ -1,8 +1,5 @@
-use ctru::console::Console;
 use ctru::gfx::Screen as _;
-use ctru::services::hid::KeyPad;
+use ctru::prelude::*;
-use ctru::services::{Apt, Hid};
-use ctru::Gfx;
 
 /// Ferris image taken from <https://rustacean.net> and scaled down to 320x240px.
 /// To regenerate the data, you will need to install `imagemagick` and run this

ctru-rs/examples/hashmaps.rs

@@ -1,7 +1,4 @@
-use ctru::console::Console;
+use ctru::prelude::*;
-use ctru::gfx::Gfx;
-use ctru::services::apt::Apt;
-use ctru::services::hid::{Hid, KeyPad};
 
 fn main() {
     // Initialize services

ctru-rs/examples/hello-both-screens.rs

@@ -1,7 +1,4 @@
-use ctru::console::Console;
+use ctru::prelude::*;
-use ctru::gfx::Gfx;
-use ctru::services::apt::Apt;
-use ctru::services::hid::{Hid, KeyPad};
 
 fn main() {
     // Initialize services

ctru-rs/examples/hello-world.rs

@@ -1,7 +1,4 @@
-use ctru::console::Console;
+use ctru::prelude::*;
-use ctru::gfx::Gfx;
-use ctru::services::apt::Apt;
-use ctru::services::hid::{Hid, KeyPad};
 
 use std::io::BufWriter;
 

ctru-rs/examples/network-sockets.rs

@@ -1,8 +1,4 @@
-use ctru::console::Console;
+use ctru::prelude::*;
-use ctru::gfx::Gfx;
-use ctru::services::apt::Apt;
-use ctru::services::hid::{Hid, KeyPad};
-use ctru::services::soc::Soc;
 
 use std::io::{self, Read, Write};
 use std::net::{Shutdown, TcpListener};

ctru-rs/examples/output-3dslink.rs

@@ -8,10 +8,7 @@
 //! 3dslink --server target/armv6k-nintendo-3ds/debug/examples/output-3dslink.3dsx
 //! ```
 
-use ctru::gfx::Gfx;
+use ctru::prelude::*;
-use ctru::services::apt::Apt;
-use ctru::services::hid::{Hid, KeyPad};
-use ctru::services::soc::Soc;
 
 fn main() {
     ctru::init();

ctru-rs/examples/romfs.rs

@@ -1,7 +1,4 @@
-use ctru::console::Console;
+use ctru::prelude::*;
-use ctru::gfx::Gfx;
-use ctru::services::apt::Apt;
-use ctru::services::hid::{Hid, KeyPad};
 
 fn main() {
     ctru::init();

ctru-rs/examples/software-keyboard.rs

@@ -1,8 +1,5 @@
 use ctru::applets::swkbd::{Button, Swkbd};
-use ctru::console::Console;
+use ctru::prelude::*;
-use ctru::gfx::Gfx;
-use ctru::services::apt::Apt;
-use ctru::services::hid::{Hid, KeyPad};
 
 fn main() {
     ctru::init();

ctru-rs/examples/system-configuration.rs

@@ -1,8 +1,5 @@
-use ctru::console::Console;
+use ctru::prelude::*;
-use ctru::gfx::Gfx;
-use ctru::services::apt::Apt;
 use ctru::services::cfgu::Cfgu;
-use ctru::services::hid::{Hid, KeyPad};
 
 fn main() {
     ctru::init();

ctru-rs/examples/thread-basic.rs

@@ -1,9 +1,7 @@
 #![feature(horizon_thread_ext)]
 
-use ctru::console::Console;
+use ctru::prelude::*;
-use ctru::gfx::Gfx;
+
-use ctru::services::apt::Apt;
-use ctru::services::hid::{Hid, KeyPad};
 use std::os::horizon::thread::BuilderExt;
 use std::time::Duration;
 

ctru-rs/examples/thread-info.rs

@@ -2,10 +2,8 @@
 
 #![feature(horizon_thread_ext)]
 
-use ctru::console::Console;
+use ctru::prelude::*;
-use ctru::gfx::Gfx;
+
-use ctru::services::apt::Apt;
-use ctru::services::hid::{Hid, KeyPad};
 use std::os::horizon::thread::BuilderExt;
 
 fn main() {

ctru-rs/examples/thread-locals.rs

@@ -1,9 +1,7 @@
 #![feature(horizon_thread_ext)]
 
-use ctru::console::Console;
+use ctru::prelude::*;
-use ctru::services::hid::KeyPad;
+
-use ctru::services::{Apt, Hid};
-use ctru::Gfx;
 use std::cell::RefCell;
 use std::os::horizon::thread::BuilderExt;
 

ctru-rs/examples/time-rtc.rs

@@ -1,7 +1,4 @@
-use ctru::console::Console;
+use ctru::prelude::*;
-use ctru::gfx::Gfx;
-use ctru::services::apt::Apt;
-use ctru::services::hid::{Hid, KeyPad};
 
 fn main() {
     ctru::init();

ctru-rs/src/lib.rs

@@ -75,6 +75,7 @@ pub mod applets;
 pub mod console;
 pub mod error;
 pub mod gfx;
+pub mod prelude;
 pub mod services;
 pub mod srv;
 
@@ -101,6 +102,3 @@ cfg_if::cfg_if! {
 mod test_runner;
 
 pub use crate::error::{Error, Result};
-
-pub use crate::gfx::Gfx;
-pub use crate::srv::Srv;

ctru-rs/src/prelude.rs

@@ -0,0 +1,3 @@
+pub use crate::console::Console;
+pub use crate::gfx::Gfx;
+pub use crate::services::{hid::KeyPad, soc::Soc, Apt, Hid};