From fc4542463b190c8ec16346da17e616297e55ee84 Mon Sep 17 00:00:00 2001 From: Philipp Oppermann Date: Sun, 18 Nov 2018 13:59:31 +0100 Subject: [PATCH] Rename vga_buffer::print function to avoid name clash with macro --- src/vga_buffer.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vga_buffer.rs b/src/vga_buffer.rs index e63c4077..887d0917 100644 --- a/src/vga_buffer.rs +++ b/src/vga_buffer.rs @@ -151,7 +151,7 @@ impl fmt::Write for Writer { /// Like the `print!` macro in the standard library, but prints to the VGA text buffer. #[macro_export] macro_rules! print { - ($($arg:tt)*) => ($crate::vga_buffer::print(format_args!($($arg)*))); + ($($arg:tt)*) => ($crate::vga_buffer::_print(format_args!($($arg)*))); } /// Like the `print!` macro in the standard library, but prints to the VGA text buffer. @@ -163,7 +163,7 @@ macro_rules! println { } /// Prints the given formatted string to the VGA text buffer through the global `WRITER` instance. -pub fn print(args: fmt::Arguments) { +pub fn _print(args: fmt::Arguments) { use core::fmt::Write; use x86_64::instructions::interrupts;