andrey/rCore
1
0
Fork 0
mirror of https://github.com/rcore-os/rCore.git synced 2024-11-26 09:53:28 +04:00
Code Issues Projects Releases Wiki Activity

remove '\r'

Browse Source
This commit is contained in:
WangRunji 2018-12-27 15:56:20 +08:00
parent 0d957ff1a6
commit de24f6673c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kernel/src/logging.rs
View File

@ -30,8 +30,8 @@ macro_rules! print {
#[macro_export] #[macro_export]
macro_rules! println { macro_rules! println {
($fmt:expr) => (print!(concat!($fmt, "\r\n"))); ($fmt:expr) => (print!(concat!($fmt, "\n")));
($fmt:expr, $($arg:tt)*) => (print!(concat!($fmt, "\r\n"), $($arg)*)); ($fmt:expr, $($arg:tt)*) => (print!(concat!($fmt, "\n"), $($arg)*));
} }
/// Add escape sequence to print with color in Linux console /// Add escape sequence to print with color in Linux console
@ -67,7 +67,7 @@ impl Log for SimpleLogger {
if self.enabled(record.metadata()) && !DISABLED_TARGET.contains(&record.target()) { if self.enabled(record.metadata()) && !DISABLED_TARGET.contains(&record.target()) {
// let target = record.target(); // let target = record.target();
// let begin = target.as_bytes().iter().rposition(|&c| c == b':').map(|i| i + 1).unwrap_or(0); // let begin = target.as_bytes().iter().rposition(|&c| c == b':').map(|i| i + 1).unwrap_or(0);
print_in_color(format_args!("[{:>5}] {}\r\n", record.level(), record.args()), Color::from(record.level())); print_in_color(format_args!("[{:>5}] {}\n", record.level(), record.args()), Color::from(record.level()));
} }
} }
fn flush(&self) {} fn flush(&self) {}