Merge pull request #283 from matthiasbeyer/libimagrt/warning-to-error
Libimagrt/warning to error
This commit is contained in:
commit
34ce278af3
4 changed files with 19 additions and 6 deletions
|
@ -8,7 +8,7 @@ use toml::{Parser, Value};
|
||||||
*/
|
*/
|
||||||
pub mod error {
|
pub mod error {
|
||||||
use std::error::Error;
|
use std::error::Error;
|
||||||
use std::fmt::{Debug, Display, Formatter};
|
use std::fmt::{Display, Formatter};
|
||||||
use std::fmt::Error as FmtError;
|
use std::fmt::Error as FmtError;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -231,11 +231,11 @@ fn fetch_config(rtp: &PathBuf) -> Result<Value> {
|
||||||
.map(|path| {
|
.map(|path| {
|
||||||
let content = {
|
let content = {
|
||||||
let mut s = String::new();
|
let mut s = String::new();
|
||||||
let mut f = File::open(path);
|
let f = File::open(path);
|
||||||
if f.is_err() {
|
if f.is_err() {
|
||||||
}
|
}
|
||||||
let mut f = f.unwrap();
|
let mut f = f.unwrap();
|
||||||
f.read_to_string(&mut s);
|
f.read_to_string(&mut s).ok();
|
||||||
s
|
s
|
||||||
};
|
};
|
||||||
Parser::new(&content[..]).parse()
|
Parser::new(&content[..]).parse()
|
||||||
|
|
|
@ -41,8 +41,7 @@ pub fn edit_in_tmpfile(rt: &Runtime, s: &mut String) -> EditResult<()> {
|
||||||
let file_path = file.path();
|
let file_path = file.path();
|
||||||
let mut file = try!(file.reopen());
|
let mut file = try!(file.reopen());
|
||||||
|
|
||||||
file.write_all(&s.clone().into_bytes()[..]);
|
try!(file.write_all(&s.clone().into_bytes()[..]));
|
||||||
|
|
||||||
try!(file.sync_data());
|
try!(file.sync_data());
|
||||||
|
|
||||||
if let Some(mut editor) = rt.editor() {
|
if let Some(mut editor) = rt.editor() {
|
||||||
|
|
|
@ -1,3 +1,17 @@
|
||||||
|
#![deny(
|
||||||
|
non_camel_case_types,
|
||||||
|
non_snake_case,
|
||||||
|
path_statements,
|
||||||
|
trivial_numeric_casts,
|
||||||
|
unstable_features,
|
||||||
|
unused_allocation,
|
||||||
|
unused_import_braces,
|
||||||
|
unused_imports,
|
||||||
|
unused_mut,
|
||||||
|
unused_qualifications,
|
||||||
|
while_true,
|
||||||
|
)]
|
||||||
|
|
||||||
#[macro_use] extern crate log;
|
#[macro_use] extern crate log;
|
||||||
#[macro_use] extern crate itertools;
|
#[macro_use] extern crate itertools;
|
||||||
#[cfg(unix)] extern crate xdg_basedir;
|
#[cfg(unix)] extern crate xdg_basedir;
|
||||||
|
|
|
@ -26,7 +26,7 @@ impl Log for ImagLogger {
|
||||||
fn log(&self, record: &LogRecord) {
|
fn log(&self, record: &LogRecord) {
|
||||||
if self.enabled(record.metadata()) {
|
if self.enabled(record.metadata()) {
|
||||||
// TODO: This is just simple logging. Maybe we can enhance this lateron
|
// TODO: This is just simple logging. Maybe we can enhance this lateron
|
||||||
writeln!(stderr(), "[imag][{: <5}]: {}", record.level(), record.args());
|
writeln!(stderr(), "[imag][{: <5}]: {}", record.level(), record.args()).ok();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue