From d8c1ba45ed6a4c1b22038759d77ed831f4c7355c Mon Sep 17 00:00:00 2001 From: Paul Pan Date: Sun, 16 Jun 2024 22:29:58 +0800 Subject: [PATCH] chore: logging: make clippy happy --- kernel/src/logging.rs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/kernel/src/logging.rs b/kernel/src/logging.rs index 0197b63..0d60101 100644 --- a/kernel/src/logging.rs +++ b/kernel/src/logging.rs @@ -9,7 +9,7 @@ use log::{LevelFilter, Log, Metadata, Record}; macro_rules! print { ($($arg:tt)*) => {{ use core::fmt::Write; - use crate::plat::console::CONSOLE; + use $crate::plat::console::CONSOLE; CONSOLE.lock().write_fmt(format_args!($($arg)*)).unwrap(); }}; } @@ -73,8 +73,7 @@ pub fn set_log_level(fdt: &Fdt) { .map(|args| args.split_ascii_whitespace()) .map(|args| args.filter(|arg| arg.starts_with("loglevel="))) .map(|args| args.map(|arg| arg["loglevel=".len()..].parse::())) - .map(|args| args.last()) - .flatten() + .and_then(|args| args.last()) .map(|level| level.unwrap_or(UNKNOWN_LEVEL)) .unwrap_or(UNKNOWN_LEVEL);