refactor!: remove prelude

zetanumbers · Jan 14, 2022 · 4340269 · 4340269
1 parent e2a6345
commit 4340269
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 12 deletions.
diff --git a/wasm4/src/lib.rs b/wasm4/src/lib.rs
@@ -27,13 +27,16 @@
 //! ```
 
 pub mod draw;
-pub mod prelude;
 pub mod runtime;
 pub mod sound;
 mod utils;
 
-pub use runtime::*;
-pub use utils::OutOfDomainError;
+pub use self::{
+    draw::{Framebuffer, Sprite},
+    runtime::*,
+    sound::Audio,
+    utils::OutOfDomainError,
+};
 pub use wasm4_sys as sys;
 
 pub fn trace(msg: &str) {

diff --git a/wasm4/src/prelude.rs b/wasm4/src/prelude.rs
diff --git a/wasm4/src/runtime.rs b/wasm4/src/runtime.rs
@@ -6,7 +6,7 @@ pub trait Runtime {
 }
 
 pub struct Resources {
-    pub sound: crate::sound::Resource,
+    pub sound: crate::sound::Audio,
     pub framebuffer: crate::draw::Framebuffer,
 }
 
@@ -16,7 +16,7 @@ impl Resources {
     /// Called inside of the [`crate::main`] macro.
     pub unsafe fn new() -> Self {
         Resources {
-            sound: crate::sound::Resource(()),
+            sound: crate::sound::Audio(()),
             framebuffer: crate::draw::Framebuffer::new_(),
         }
     }

diff --git a/wasm4/src/sound.rs b/wasm4/src/sound.rs
@@ -2,9 +2,9 @@ use crate::utils::OutOfDomainError;
 use core::mem;
 
 #[derive(PartialEq, Eq)]
-pub struct Resource(pub(crate) ());
+pub struct Audio(pub(crate) ());
 
-impl Resource {
+impl Audio {
     /// Plays a sound tone. Volume is between 0 and 100.
     pub fn tone(&self, frequency: LinearFrequency, duration: Duration, volume: u32, flags: Flags) {
         // SAFETY: calling extern function
@@ -13,7 +13,7 @@ impl Resource {
 
     /// Leak resource and return static reference. Expect no runtime overhead.
     pub fn leak(self) -> &'static Self {
-        &Resource(())
+        &Audio(())
     }
 }