src/commands/bitmap_command.rs

@@ -45,8 +45,8 @@ pub unsafe extern "C" fn sp_cmd_bitmap_try_into_packet(
     heap_move_ok(unsafe { heap_remove(command) }.try_into())
 }
 
-wrap_clone!(BitmapCommand, sp_cmd_bitmap);
+wrap_clone!(sp_cmd_bitmap::BitmapCommand);
-wrap_free!(BitmapCommand, sp_cmd_bitmap);
+wrap_free!(sp_cmd_bitmap::BitmapCommand);
 
 /// Returns a pointer to the provided `BitmapCommand`.
 ///

src/commands/bitvec_command.rs

@@ -45,8 +45,8 @@ pub unsafe extern "C" fn sp_cmd_bitvec_try_into_packet(
     heap_move_ok(unsafe { heap_remove(command) }.try_into())
 }
 
-wrap_clone!(BitVecCommand, sp_cmd_bitvec);
+wrap_clone!(sp_cmd_bitvec::BitVecCommand);
-wrap_free!(BitVecCommand, sp_cmd_bitvec);
+wrap_free!(sp_cmd_bitvec::BitVecCommand);
 
 /// Returns a pointer to the [BitVec] contained in the [BitVecCommand].
 #[no_mangle]

src/commands/brightness_grid_command.rs

@@ -41,8 +41,8 @@ pub unsafe extern "C" fn sp_cmd_brightness_grid_into_packet(
     heap_move_ok(unsafe { heap_remove(command) }.try_into())
 }
 
-wrap_clone!(BrightnessGridCommand, sp_cmd_brightness_grid);
+wrap_clone!(sp_cmd_brightness_grid::BrightnessGridCommand);
-wrap_free!(BrightnessGridCommand, sp_cmd_brightness_grid);
+wrap_free!(sp_cmd_brightness_grid::BrightnessGridCommand);
 
 /// Moves the provided [BrightnessGrid] to be contained in the [BrightnessGridCommand].
 #[no_mangle]

src/commands/cc_only_commands.rs

@@ -12,7 +12,7 @@ pub unsafe extern "C" fn sp_cmd_clear_new() -> NonNull<ClearCommand> {
     heap_move_nonnull(ClearCommand)
 }
 
-wrap_free!(ClearCommand, sp_cmd_clear);
+wrap_free!(sp_cmd_clear::ClearCommand);
 
 /// Kills the udp daemon on the display, which usually results in a restart.
 ///
@@ -24,7 +24,7 @@ pub unsafe extern "C" fn sp_cmd_hard_reset_new() -> NonNull<HardResetCommand> {
     heap_move_nonnull(HardResetCommand)
 }
 
-wrap_free!(HardResetCommand, sp_cmd_hard_reset);
+wrap_free!(sp_cmd_hard_reset::HardResetCommand);
 
 /// A yet-to-be-tested command.
 ///
@@ -34,4 +34,4 @@ pub unsafe extern "C" fn sp_cmd_fade_out_new() -> NonNull<FadeOutCommand> {
     heap_move_nonnull(FadeOutCommand)
 }
 
-wrap_free!(FadeOutCommand, sp_cmd_fade_out);
+wrap_free!(sp_cmd_fade_out::FadeOutCommand);

src/commands/char_grid_command.rs

@@ -41,8 +41,8 @@ pub unsafe extern "C" fn sp_cmd_char_grid_try_into_packet(
     heap_move_ok(unsafe { heap_remove(command) }.try_into())
 }
 
-wrap_clone!(CharGridCommand, sp_cmd_char_grid);
+wrap_clone!(sp_cmd_char_grid::CharGridCommand);
-wrap_free!(CharGridCommand, sp_cmd_char_grid);
+wrap_free!(sp_cmd_char_grid::CharGridCommand);
 
 /// Moves the provided [CharGrid] to be contained in the [CharGridCommand].
 #[no_mangle]

src/commands/cp437_grid_command.rs

@@ -41,8 +41,8 @@ pub unsafe extern "C" fn sp_cmd_cp437_grid_try_into_packet(
     heap_move_ok(unsafe { heap_remove(command) }.try_into())
 }
 
-wrap_clone!(Cp437GridCommand, sp_cmd_cp437_grid);
+wrap_clone!(sp_cmd_cp437_grid::Cp437GridCommand);
-wrap_free!(Cp437GridCommand, sp_cmd_cp437_grid);
+wrap_free!(sp_cmd_cp437_grid::Cp437GridCommand);
 
 /// Moves the provided bitmap into the provided command.
 ///

src/commands/global_brightness_command.rs

@@ -22,8 +22,8 @@ pub unsafe extern "C" fn sp_cmd_brightness_global_into_packet(
     heap_move_nonnull(unsafe { heap_remove(command) }.into())
 }
 
-wrap_clone!(GlobalBrightnessCommand, sp_cmd_brightness_global);
+wrap_clone!(sp_cmd_brightness_global::GlobalBrightnessCommand);
-wrap_free!(GlobalBrightnessCommand, sp_cmd_brightness_global);
+wrap_free!(sp_cmd_brightness_global::GlobalBrightnessCommand);
 
 /// Moves the provided bitmap to be contained in the command.
 #[no_mangle]

src/containers/bitmap.rs

@@ -80,8 +80,8 @@ pub unsafe extern "C" fn sp_bitmap_from_bitvec(
     heap_move_ok(Bitmap::from_bitvec(width, bitvec))
 }
 
-wrap_clone!(Bitmap, sp_bitmap);
+wrap_clone!(sp_bitmap::Bitmap);
-wrap_free!(Bitmap, sp_bitmap);
+wrap_free!(sp_bitmap::Bitmap);
 
 wrap_method!(
     sp_bitmap::Bitmap;

src/containers/bitvec.rs

@@ -35,8 +35,8 @@ pub unsafe extern "C" fn sp_bitvec_load(
     heap_move_nonnull(DisplayBitVec::from_slice(data))
 }
 
-wrap_clone!(DisplayBitVec, sp_bitvec);
+wrap_clone!(sp_bitvec::DisplayBitVec);
-wrap_free!(DisplayBitVec, sp_bitvec);
+wrap_free!(sp_bitvec::DisplayBitVec);
 
 wrap_method!(
     sp_bitvec::DisplayBitVec;

src/containers/brightness_grid.rs

@@ -52,8 +52,8 @@ pub unsafe extern "C" fn sp_brightness_grid_load(
     )
 }
 
-wrap_clone!(BrightnessGrid, sp_brightness_grid);
+wrap_clone!(sp_brightness_grid::BrightnessGrid);
-wrap_free!(BrightnessGrid, sp_brightness_grid);
+wrap_free!(sp_brightness_grid::BrightnessGrid);
 
 wrap_method!(
     sp_brightness_grid::BrightnessGrid;

src/containers/char_grid.rs

@@ -39,8 +39,8 @@ pub unsafe extern "C" fn sp_char_grid_load(
     heap_move_ok(CharGrid::load_utf8(width, height, data.to_vec()))
 }
 
-wrap_clone!(CharGrid, sp_char_grid);
+wrap_clone!(sp_char_grid::CharGrid);
-wrap_free!(CharGrid, sp_char_grid);
+wrap_free!(sp_char_grid::CharGrid);
 
 wrap_method!(
     sp_char_grid::CharGrid;

src/containers/cp437_grid.rs

@@ -30,8 +30,8 @@ pub unsafe extern "C" fn sp_cp437_grid_load(
     heap_move_some(Cp437Grid::load(width, height, data))
 }
 
-wrap_clone!(Cp437Grid, sp_cp437_grid);
+wrap_clone!(sp_cp437_grid::Cp437Grid);
-wrap_free!(Cp437Grid, sp_cp437_grid);
+wrap_free!(sp_cp437_grid::Cp437Grid);
 
 wrap_method!(
     sp_cp437::Cp437Grid;

src/macros.rs

@@ -1,5 +1,5 @@
 macro_rules! wrap_free {
-    ($typ:ty, $prefix:ident) => {
+    ($prefix:ident :: $typ:ty) => {
         paste::paste! {
             #[doc = concat!("Deallocates a [", stringify!($typ), "] instance.")]
             #[no_mangle]
@@ -11,7 +11,7 @@ macro_rules! wrap_free {
 }
 
 macro_rules! wrap_clone {
-    ($typ:ty, $prefix:ident) => {
+    ($prefix:ident :: $typ:ty) => {
         paste::paste! {
             #[doc = concat!("Clones a [", stringify!($typ), "] instance.")]
             #[no_mangle]

src/packet.rs

@@ -91,8 +91,8 @@ pub unsafe extern "C" fn sp_packet_serialize_to(
     }
 }
 
-wrap_clone!(Packet, sp_packet);
+wrap_clone!(sp_packet::Packet);
-wrap_free!(Packet, sp_packet);
+wrap_free!(sp_packet::Packet);
 
 /// Converts u16 into [CommandCode].
 ///

src/udp.rs

@@ -144,4 +144,4 @@ pub unsafe extern "C" fn sp_udp_send_header(
         .is_ok()
 }
 
-wrap_free!(UdpSocket, sp_udp);
+wrap_free!(sp_udp::UdpSocket);