diff --git a/src/data.rs b/src/data.rs index 2d3d3c64f132dd4cf8f1a285269256e35ffdc706..1c9ffb145358ced47fd552e8c68ef62e6c6aec63 100644 --- a/src/data.rs +++ b/src/data.rs @@ -13,8 +13,6 @@ use std::path::PathBuf; use std::rc::Rc; use std::vec::Vec; -use env_logger::{Builder, Target}; // remove me - use xkbcommon::xkb; use ::action; @@ -63,7 +61,7 @@ pub mod c { _ => ::data::ContentPurpose::Normal, }; - log::error!("fn squeek_load_layout(): load_layout_data_with_fallback(name:{}, type:{}, variant:{})", name, type_, variant); + log_print!(logging::Level::Info, "fn squeek_load_layout(): load_layout_data_with_fallback(name:{}, type:{}, variant:{})", name, type_, variant); let (kind, layout) = load_layout_data_with_fallback(&name, type_, variant); let layout = ::layout::Layout::new(layout, kind); Box::into_raw(Box::new(layout)) @@ -201,8 +199,8 @@ fn list_layout_sources( } }, // The layout's base name starts with a "+". Weird but OK. - None => { - log_print!(logging::Level::Surprise, "Base layout name is empty: {}", name); + None => {log_ + print!(logging::Level::Surprise, "Base layout name is empty: {}", name); ret } } @@ -272,7 +270,7 @@ fn load_layout_data_with_fallback( //let mut variant_path_buf = PathBuf::new(); //variant_path_buf.push(variant_path); - log::error!("fn load_layout_data_with_fallback(): list_layout_sources(name:{}, kind:{}, path:{})", name, kind, path); + log_print!(logging::Level::Info, "fn load_layout_data_with_fallback(): list_layout_sources(name:{}, kind:{}, path:{})", name, kind, path); for (kind, source) in list_layout_sources(name, kind, path) { let layout = load_layout_data(source.clone()); match layout {