From 70d34f1fc845d360101cd3cb25398f83294db142 Mon Sep 17 00:00:00 2001 From: Gwilym Inzani Date: Sun, 23 Jul 2023 20:22:22 +0100 Subject: [PATCH] Rename to include_xm to match the rest of agb --- tracker/agb-tracker/examples/basic.rs | 4 ++-- tracker/agb-tracker/examples/timing.rs | 4 ++-- tracker/agb-tracker/src/lib.rs | 8 ++++---- tracker/agb-xm/src/lib.rs | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tracker/agb-tracker/examples/basic.rs b/tracker/agb-tracker/examples/basic.rs index 0c682767..260e8735 100644 --- a/tracker/agb-tracker/examples/basic.rs +++ b/tracker/agb-tracker/examples/basic.rs @@ -3,9 +3,9 @@ use agb::sound::mixer::Frequency; use agb::Gba; -use agb_tracker::{import_xm, Track, Tracker}; +use agb_tracker::{include_xm, Track, Tracker}; -const DB_TOFFE: Track = import_xm!("examples/db_toffe.xm"); +const DB_TOFFE: Track = include_xm!("examples/db_toffe.xm"); #[agb::entry] fn main(mut gba: Gba) -> ! { diff --git a/tracker/agb-tracker/examples/timing.rs b/tracker/agb-tracker/examples/timing.rs index 996484b7..ff0a8e6e 100644 --- a/tracker/agb-tracker/examples/timing.rs +++ b/tracker/agb-tracker/examples/timing.rs @@ -3,9 +3,9 @@ use agb::sound::mixer::Frequency; use agb::Gba; -use agb_tracker::{import_xm, Track, Tracker}; +use agb_tracker::{include_xm, Track, Tracker}; -const DB_TOFFE: Track = import_xm!("examples/db_toffe.xm"); +const DB_TOFFE: Track = include_xm!("examples/db_toffe.xm"); #[agb::entry] fn main(mut gba: Gba) -> ! { diff --git a/tracker/agb-tracker/src/lib.rs b/tracker/agb-tracker/src/lib.rs index e88a1e93..eecf2a32 100644 --- a/tracker/agb-tracker/src/lib.rs +++ b/tracker/agb-tracker/src/lib.rs @@ -27,9 +27,9 @@ //! #![no_main] //! //! use agb::{Gba, sound::mixer::Frequency}; -//! use agb_tracker::{import_xm, Track, Tracker}; +//! use agb_tracker::{include_xm, Track, Tracker}; //! -//! const DB_TOFFE: Track = import_xm!("examples/db_toffe.xm"); +//! const DB_TOFFE: Track = include_xm!("examples/db_toffe.xm"); //! //! #[agb::entry] //! fn main(mut gba: Gba) -> ! { @@ -75,7 +75,7 @@ use agb::{ /// Import an XM file. Only available if you have the `xm` feature enabled (enabled by default). #[cfg(feature = "xm")] -pub use agb_xm::import_xm; +pub use agb_xm::include_xm; #[doc(hidden)] pub mod __private { @@ -83,7 +83,7 @@ pub mod __private { pub use agb_tracker_interop; } -/// A reference to a track. You should create this using one of the import macros. +/// A reference to a track. You should create this using one of the include macros. pub use agb_tracker_interop::Track; /// Stores the required state in order to play tracker music. diff --git a/tracker/agb-xm/src/lib.rs b/tracker/agb-xm/src/lib.rs index 0ccc3918..bea1dcb4 100644 --- a/tracker/agb-xm/src/lib.rs +++ b/tracker/agb-xm/src/lib.rs @@ -3,6 +3,6 @@ use proc_macro_error::proc_macro_error; #[proc_macro_error] #[proc_macro] -pub fn import_xm(args: TokenStream) -> TokenStream { +pub fn include_xm(args: TokenStream) -> TokenStream { agb_xm_core::agb_xm_core(args.into()).into() }