Skip to content
Snippets Groups Projects
Commit e3b55958 authored by gwenn's avatar gwenn
Browse files

Upgrade to log 0.4

parent fb21d06c
No related branches found
No related tags found
No related merge requests found
...@@ -16,7 +16,7 @@ appveyor = { repository = "kkawakam/rustyline" } ...@@ -16,7 +16,7 @@ appveyor = { repository = "kkawakam/rustyline" }
[dependencies] [dependencies]
libc = "0.2" libc = "0.2"
log = "0.3" log = "0.4"
unicode-width = "0.1" unicode-width = "0.1"
unicode-segmentation = "1.0" unicode-segmentation = "1.0"
......
extern crate log; extern crate log;
extern crate rustyline; extern crate rustyline;
use log::{LogLevel, LogLevelFilter, LogMetadata, LogRecord, SetLoggerError}; use log::{Level, LevelFilter, Metadata, Record, SetLoggerError};
use rustyline::completion::FilenameCompleter; use rustyline::completion::FilenameCompleter;
use rustyline::hint::Hinter; use rustyline::hint::Hinter;
...@@ -68,23 +68,26 @@ fn main() { ...@@ -68,23 +68,26 @@ fn main() {
rl.save_history("history.txt").unwrap(); rl.save_history("history.txt").unwrap();
} }
static LOGGER: Logger = Logger;
struct Logger; struct Logger;
impl log::Log for Logger { impl log::Log for Logger {
fn enabled(&self, metadata: &LogMetadata) -> bool { fn enabled(&self, metadata: &Metadata) -> bool {
metadata.level() <= LogLevel::Debug metadata.level() <= Level::Debug
} }
fn log(&self, record: &LogRecord) { fn log(&self, record: &Record) {
if self.enabled(record.metadata()) { if self.enabled(record.metadata()) {
eprintln!("{} - {}", record.level(), record.args()); eprintln!("{} - {}", record.level(), record.args());
} }
} }
fn flush(&self) {
}
} }
fn init_logger() -> Result<(), SetLoggerError> { fn init_logger() -> Result<(), SetLoggerError> {
log::set_logger(|max_log_level| { try!(log::set_logger(&LOGGER));
max_log_level.set(LogLevelFilter::Info); log::set_max_level(LevelFilter::Info);
Box::new(Logger) Ok(())
})
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment