From ccd13fecf1f6302d365012b7fe334e18bca0d87b Mon Sep 17 00:00:00 2001 From: Drew Galbraith Date: Sat, 27 Jul 2024 08:36:56 -0700 Subject: [PATCH] Use in macro. --- rust/lib/mammoth/src/syscall.rs | 4 +--- rust/usr/testbed/src/main.rs | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/rust/lib/mammoth/src/syscall.rs b/rust/lib/mammoth/src/syscall.rs index 9f16f13..ec8fe9d 100644 --- a/rust/lib/mammoth/src/syscall.rs +++ b/rust/lib/mammoth/src/syscall.rs @@ -146,9 +146,7 @@ macro_rules! debug { ($fmt:literal, $($val:expr),+) => {{ use core::fmt::Write as _; use alloc::string::String; - // TODO: Find a way to do this so we don't have to import writer. - // We can't fully qualify this if we want to use it in this crate. - let mut w = Writer::new(); + let mut w = $crate::syscall::Writer::new(); write!(&mut w, $fmt, $($val),*).expect("Failed to format"); let s: String = w.into(); debug(&s); diff --git a/rust/usr/testbed/src/main.rs b/rust/usr/testbed/src/main.rs index ab46cf9..ce34571 100644 --- a/rust/usr/testbed/src/main.rs +++ b/rust/usr/testbed/src/main.rs @@ -9,7 +9,6 @@ use mammoth::debug; use mammoth::define_entry; use mammoth::syscall::debug; use mammoth::syscall::z_err_t; -use mammoth::syscall::Writer; define_entry!();