Use env_logger instead of simple_logger (#241)

* Use env_logger instead of simple_logger * Make clippy happy
tauri-apps · Nov 12, 2021 · 72846fb · 72846fb
1 parent 1632772
commit 72846fb
Show file tree

Hide file tree

Showing 32 changed files with 33 additions and 62 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -44,7 +44,7 @@ crossbeam-channel = "0.5"
 
 [dev-dependencies]
 image = "0.23"
-simple_logger = "1.13"
+env_logger = "0.9"
 
 [target."cfg(target_os = \"android\")".dependencies]
 ndk = "0.4"

diff --git a/examples/accelerator.rs b/examples/accelerator.rs
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 fn main() {
-  use simple_logger::SimpleLogger;
   use tao::{
     accelerator::{Accelerator, RawMods},
     dpi::LogicalSize,
@@ -12,7 +11,7 @@ fn main() {
     window::WindowBuilder,
   };
 
-  SimpleLogger::new().init().unwrap();
+  env_logger::init();
 
   // create a sample hotkey
   let hotkey = Accelerator::new(RawMods::Shift, KeyCode::Digit1);

diff --git a/examples/control_flow.rs b/examples/control_flow.rs
@@ -3,7 +3,6 @@
 
 use std::{thread, time};
 
-use simple_logger::SimpleLogger;
 use tao::{
   event::{ElementState, Event, KeyEvent, WindowEvent},
   event_loop::{ControlFlow, EventLoop},
@@ -23,7 +22,7 @@ const POLL_SLEEP_TIME: time::Duration = time::Duration::from_millis(100);
 
 #[allow(clippy::single_match)]
 fn main() {
-  SimpleLogger::new().init().unwrap();
+  env_logger::init();
 
   println!("Press '1' to switch to Wait mode.");
   println!("Press '2' to switch to WaitUntil mode.");

diff --git a/examples/cursor.rs b/examples/cursor.rs
@@ -1,15 +1,14 @@
 // Copyright 2019-2021 Tauri Programme within The Commons Conservancy
 // SPDX-License-Identifier: Apache-2.0
 
-use simple_logger::SimpleLogger;
 use tao::{
   event::{ElementState, Event, KeyEvent, WindowEvent},
   event_loop::{ControlFlow, EventLoop},
   window::{CursorIcon, WindowBuilder},
 };
 
 fn main() {
-  SimpleLogger::new().init().unwrap();
+  env_logger::init();
   let event_loop = EventLoop::new();
 
   let window = WindowBuilder::new().build(&event_loop).unwrap();

diff --git a/examples/cursor_grab.rs b/examples/cursor_grab.rs
@@ -1,7 +1,6 @@
 // Copyright 2019-2021 Tauri Programme within The Commons Conservancy
 // SPDX-License-Identifier: Apache-2.0
 
-use simple_logger::SimpleLogger;
 use tao::{
   event::{DeviceEvent, ElementState, Event, KeyEvent, WindowEvent},
   event_loop::{ControlFlow, EventLoop},
@@ -11,7 +10,7 @@ use tao::{
 
 #[allow(clippy::single_match)]
 fn main() {
-  SimpleLogger::new().init().unwrap();
+  env_logger::init();
   let event_loop = EventLoop::new();
 
   let window = WindowBuilder::new()

diff --git a/examples/custom_events.rs b/examples/custom_events.rs
@@ -3,7 +3,7 @@
 
 #[allow(clippy::single_match)]
 fn main() {
-  use simple_logger::SimpleLogger;
+  env_logger::init();
   use tao::{
     event::{Event, WindowEvent},
     event_loop::{ControlFlow, EventLoop},
@@ -15,7 +15,6 @@ fn main() {
     Timer,
   }
 
-  SimpleLogger::new().init().unwrap();
   let event_loop = EventLoop::<CustomEvent>::with_user_event();
 
   let _window = WindowBuilder::new()

diff --git a/examples/custom_menu.rs b/examples/custom_menu.rs
@@ -1,7 +1,6 @@
 // Copyright 2019-2021 Tauri Programme within The Commons Conservancy
 // SPDX-License-Identifier: Apache-2.0
 
-use simple_logger::SimpleLogger;
 #[cfg(target_os = "macos")]
 use tao::platform::macos::{CustomMenuItemExtMacOS, NativeImage};
 use tao::{
@@ -15,7 +14,7 @@ use tao::{
 };
 
 fn main() {
-  SimpleLogger::new().init().unwrap();
+  env_logger::init();
   let event_loop = EventLoop::new();
 
   // create clipboard instance

diff --git a/examples/drag_window.rs b/examples/drag_window.rs
@@ -1,7 +1,6 @@
 // Copyright 2019-2021 Tauri Programme within The Commons Conservancy
 // SPDX-License-Identifier: Apache-2.0
 
-use simple_logger::SimpleLogger;
 use tao::{
   event::{ElementState, Event, KeyEvent, MouseButton, StartCause, WindowEvent},
   event_loop::{ControlFlow, EventLoop},
@@ -11,7 +10,7 @@ use tao::{
 
 #[allow(clippy::single_match)]
 fn main() {
-  SimpleLogger::new().init().unwrap();
+  env_logger::init();
   let event_loop = EventLoop::new();
 
   let window_1 = WindowBuilder::new().build(&event_loop).unwrap();

diff --git a/examples/fullscreen.rs b/examples/fullscreen.rs
@@ -3,7 +3,6 @@
 
 use std::io::{stdin, stdout, Write};
 
-use simple_logger::SimpleLogger;
 use tao::{
   event::{ElementState, Event, KeyEvent, WindowEvent},
   event_loop::{ControlFlow, EventLoop},
@@ -14,7 +13,7 @@ use tao::{
 #[allow(clippy::single_match)]
 #[allow(clippy::ok_expect)]
 fn main() {
-  SimpleLogger::new().init().unwrap();
+  env_logger::init();
   let event_loop = EventLoop::new();
 
   print!("Please choose the fullscreen mode: (1) exclusive, (2) borderless: ");

diff --git a/examples/global_shortcut.rs b/examples/global_shortcut.rs
@@ -3,7 +3,6 @@
 
 #[cfg(any(target_os = "windows", target_os = "linux", target_os = "macos"))]
 fn main() {
-  use simple_logger::SimpleLogger;
   use std::str::FromStr;
   use tao::{
     accelerator::{Accelerator, AcceleratorId, RawMods, SysMods},
@@ -14,7 +13,7 @@ fn main() {
     window::WindowBuilder,
   };
 
-  SimpleLogger::new().init().unwrap();
+  env_logger::init();
   let event_loop = EventLoop::new();
 
   // create new shortcut manager instance

diff --git a/examples/handling_close.rs b/examples/handling_close.rs
@@ -1,7 +1,6 @@
 // Copyright 2019-2021 Tauri Programme within The Commons Conservancy
 // SPDX-License-Identifier: Apache-2.0
 
-use simple_logger::SimpleLogger;
 use tao::{
   event::{ElementState, Event, KeyEvent, WindowEvent},
   event_loop::{ControlFlow, EventLoop},
@@ -11,7 +10,7 @@ use tao::{
 
 #[allow(clippy::single_match)]
 fn main() {
-  SimpleLogger::new().init().unwrap();
+  env_logger::init();
   let event_loop = EventLoop::new();
 
   let _window = WindowBuilder::new()

diff --git a/examples/min_max_size.rs b/examples/min_max_size.rs
@@ -1,7 +1,6 @@
 // Copyright 2019-2021 Tauri Programme within The Commons Conservancy
 // SPDX-License-Identifier: Apache-2.0
 
-use simple_logger::SimpleLogger;
 use tao::{
   dpi::LogicalSize,
   event::{Event, WindowEvent},
@@ -11,7 +10,7 @@ use tao::{
 
 #[allow(clippy::single_match)]
 fn main() {
-  SimpleLogger::new().init().unwrap();
+  env_logger::init();
   let event_loop = EventLoop::new();
 
   let window = WindowBuilder::new().build(&event_loop).unwrap();

diff --git a/examples/minimize.rs b/examples/minimize.rs
@@ -3,7 +3,6 @@
 
 extern crate tao;
 
-use simple_logger::SimpleLogger;
 use tao::{
   event::{Event, WindowEvent},
   event_loop::{ControlFlow, EventLoop},
@@ -13,7 +12,7 @@ use tao::{
 
 #[allow(clippy::single_match)]
 fn main() {
-  SimpleLogger::new().init().unwrap();
+  env_logger::init();
   let event_loop = EventLoop::new();
 
   let window = WindowBuilder::new()

diff --git a/examples/monitor_list.rs b/examples/monitor_list.rs
@@ -1,11 +1,10 @@
 // Copyright 2019-2021 Tauri Programme within The Commons Conservancy
 // SPDX-License-Identifier: Apache-2.0
 
-use simple_logger::SimpleLogger;
 use tao::{event_loop::EventLoop, window::WindowBuilder};
 
 fn main() {
-  SimpleLogger::new().init().unwrap();
+  env_logger::init();
   let event_loop = EventLoop::new();
   let window = WindowBuilder::new().build(&event_loop).unwrap();
 

diff --git a/examples/mouse_wheel.rs b/examples/mouse_wheel.rs
@@ -1,7 +1,6 @@
 // Copyright 2019-2021 Tauri Programme within The Commons Conservancy
 // SPDX-License-Identifier: Apache-2.0
 
-use simple_logger::SimpleLogger;
 use tao::{
   event::{DeviceEvent, Event, WindowEvent},
   event_loop::{ControlFlow, EventLoop},
@@ -11,7 +10,7 @@ use tao::{
 #[allow(clippy::collapsible_match)]
 #[allow(clippy::single_match)]
 fn main() {
-  SimpleLogger::new().init().unwrap();
+  env_logger::init();
   let event_loop = EventLoop::new();
 
   let window = WindowBuilder::new()

diff --git a/examples/multithreaded.rs b/examples/multithreaded.rs
@@ -6,7 +6,6 @@
 fn main() {
   use std::{collections::HashMap, sync::mpsc, thread, time::Duration};
 
-  use simple_logger::SimpleLogger;
   use tao::{
     dpi::{PhysicalPosition, PhysicalSize, Position, Size},
     event::{ElementState, Event, KeyEvent, WindowEvent},
@@ -18,7 +17,7 @@ fn main() {
   const WINDOW_COUNT: usize = 3;
   const WINDOW_SIZE: PhysicalSize<u32> = PhysicalSize::new(600, 400);
 
-  SimpleLogger::new().init().unwrap();
+  env_logger::init();
   let event_loop = EventLoop::new();
   let mut window_senders = HashMap::with_capacity(WINDOW_COUNT);
   for _ in 0..WINDOW_COUNT {

diff --git a/examples/multiwindow.rs b/examples/multiwindow.rs
@@ -3,15 +3,14 @@
 
 use std::collections::HashMap;
 
-use simple_logger::SimpleLogger;
 use tao::{
   event::{ElementState, Event, KeyEvent, WindowEvent},
   event_loop::{ControlFlow, EventLoop},
   window::Window,
 };
 
 fn main() {
-  SimpleLogger::new().init().unwrap();
+  env_logger::init();
   let event_loop = EventLoop::new();
 
   let mut windows = HashMap::new();

diff --git a/examples/parentwindow.rs b/examples/parentwindow.rs
@@ -3,7 +3,6 @@
 
 #[cfg(any(target_os = "windows", target_os = "macos"))]
 fn main() {
-  use simple_logger::SimpleLogger;
   use std::collections::HashMap;
   #[cfg(target_os = "macos")]
   use tao::platform::macos::{WindowBuilderExtMacOS, WindowExtMacOS};
@@ -17,7 +16,7 @@ fn main() {
   };
   #[cfg(target_os = "windows")]
   use windows::Win32::Foundation::HWND;
-  SimpleLogger::new().init().unwrap();
+  env_logger::init();
   let event_loop = EventLoop::new();
   let mut windows = HashMap::new();
   let main_window = WindowBuilder::new().build(&event_loop).unwrap();

diff --git a/examples/request_redraw.rs b/examples/request_redraw.rs
@@ -1,7 +1,6 @@
 // Copyright 2019-2021 Tauri Programme within The Commons Conservancy
 // SPDX-License-Identifier: Apache-2.0
 
-use simple_logger::SimpleLogger;
 use tao::{
   event::{ElementState, Event, WindowEvent},
   event_loop::{ControlFlow, EventLoop},
@@ -10,7 +9,7 @@ use tao::{
 
 #[allow(clippy::single_match)]
 fn main() {
-  SimpleLogger::new().init().unwrap();
+  env_logger::init();
   let event_loop = EventLoop::new();
 
   let window = WindowBuilder::new()

diff --git a/examples/request_redraw_threaded.rs b/examples/request_redraw_threaded.rs
@@ -3,7 +3,6 @@
 
 use std::{thread, time};
 
-use simple_logger::SimpleLogger;
 use tao::{
   event::{Event, WindowEvent},
   event_loop::{ControlFlow, EventLoop},
@@ -13,7 +12,7 @@ use tao::{
 #[allow(clippy::single_match)]
 #[allow(clippy::collapsible_match)]
 fn main() {
-  SimpleLogger::new().init().unwrap();
+  env_logger::init();
   let event_loop = EventLoop::new();
 
   let window = WindowBuilder::new()

diff --git a/examples/resizable.rs b/examples/resizable.rs
@@ -1,7 +1,6 @@
 // Copyright 2019-2021 Tauri Programme within The Commons Conservancy
 // SPDX-License-Identifier: Apache-2.0
 
-use simple_logger::SimpleLogger;
 use tao::{
   dpi::LogicalSize,
   event::{ElementState, Event, KeyEvent, WindowEvent},
@@ -12,7 +11,7 @@ use tao::{
 
 #[allow(clippy::single_match)]
 fn main() {
-  SimpleLogger::new().init().unwrap();
+  env_logger::init();
   let event_loop = EventLoop::new();
 
   let mut resizable = false;

diff --git a/examples/set_ime_position.rs b/examples/set_ime_position.rs
@@ -1,7 +1,6 @@
 // Copyright 2019-2021 Tauri Programme within The Commons Conservancy
 // SPDX-License-Identifier: Apache-2.0
 
-use simple_logger::SimpleLogger;
 use tao::{
   dpi::PhysicalPosition,
   event::{ElementState, Event, WindowEvent},
@@ -10,7 +9,7 @@ use tao::{
 };
 
 fn main() {
-  SimpleLogger::new().init().unwrap();
+  env_logger::init();
   let event_loop = EventLoop::new();
 
   let window = WindowBuilder::new().build(&event_loop).unwrap();

diff --git a/examples/system_tray.rs b/examples/system_tray.rs
@@ -6,7 +6,6 @@
 #[cfg(any(target_os = "windows", target_os = "linux", target_os = "macos"))]
 #[cfg(feature = "tray")]
 fn main() {
-  use simple_logger::SimpleLogger;
   use std::collections::HashMap;
   #[cfg(target_os = "linux")]
   use std::path::Path;
@@ -20,7 +19,7 @@ fn main() {
     window::{Window, WindowId},
   };
 
-  SimpleLogger::new().init().unwrap();
+  env_logger::init();
   let event_loop = EventLoop::new();
   let mut windows: HashMap<WindowId, Window> = HashMap::new();
 

diff --git a/examples/system_tray_no_menu.rs b/examples/system_tray_no_menu.rs
@@ -6,7 +6,6 @@
 #[cfg(any(target_os = "windows", target_os = "linux", target_os = "macos"))]
 #[cfg(feature = "tray")]
 fn main() {
-  use simple_logger::SimpleLogger;
   use std::collections::HashMap;
   #[cfg(target_os = "linux")]
   use std::path::Path;
@@ -27,7 +26,7 @@ fn main() {
     window::WindowBuilder,
   };
 
-  SimpleLogger::new().init().unwrap();
+  env_logger::init();
   #[cfg(target_os = "macos")]
   let mut event_loop = EventLoop::new();