From 12532e1734caa4fb0c71d3b0b630263e3cf22ef4 Mon Sep 17 00:00:00 2001 From: Sean Cross Date: Mon, 23 Nov 2020 17:21:03 +0800 Subject: [PATCH] log-server: fix const warnings on rust 1.48 Rust 1.48 changed how warnings of const values operate. Signed-off-by: Sean Cross --- services/log-server/src/debug.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/log-server/src/debug.rs b/services/log-server/src/debug.rs index 6527495cb..e19adef3a 100644 --- a/services/log-server/src/debug.rs +++ b/services/log-server/src/debug.rs @@ -7,7 +7,7 @@ macro_rules! print { ($($args:tt)+) => ({ use core::fmt::Write; - let _ = write!(crate::debug::DEFAULT, $($args)+); + let _ = write!(crate::debug::Uart {}, $($args)+); }); } #[macro_export] @@ -28,7 +28,7 @@ macro_rules! println fn handle_irq(irq_no: usize, arg: *mut usize) { print!("Handling IRQ {} (arg: {:08x}): ", irq_no, arg as usize); - while let Some(c) = crate::debug::DEFAULT.getc() { + while let Some(c) = {crate::debug::Uart {}}.getc() { print!("{}", c as char); } println!();