From e4754999b7e7f27786092a62eda5275672d74130 Mon Sep 17 00:00:00 2001 From: Logan Magee Date: Wed, 9 Sep 2020 17:58:30 -0800 Subject: [PATCH] Replace deprecated simple_logger initialization --- examples/control_flow.rs | 3 ++- examples/cursor.rs | 3 ++- examples/cursor_grab.rs | 3 ++- examples/custom_events.rs | 3 ++- examples/fullscreen.rs | 4 +++- examples/handling_close.rs | 3 ++- examples/min_max_size.rs | 3 ++- examples/minimize.rs | 3 ++- examples/monitor_list.rs | 3 ++- examples/multithreaded.rs | 3 ++- examples/multiwindow.rs | 4 +++- examples/request_redraw.rs | 3 ++- examples/request_redraw_threaded.rs | 3 ++- examples/resizable.rs | 3 ++- examples/timer.rs | 4 +++- examples/transparent.rs | 3 ++- examples/video_modes.rs | 3 ++- examples/window.rs | 3 ++- examples/window_debug.rs | 3 ++- examples/window_icon.rs | 4 +++- examples/window_run_return.rs | 4 +++- 21 files changed, 47 insertions(+), 21 deletions(-) diff --git a/examples/control_flow.rs b/examples/control_flow.rs index 6d715412..64372a9b 100644 --- a/examples/control_flow.rs +++ b/examples/control_flow.rs @@ -1,5 +1,6 @@ use std::{thread, time}; +use simple_logger::SimpleLogger; use winit::{ event::{Event, KeyboardInput, WindowEvent}, event_loop::{ControlFlow, EventLoop}, @@ -17,7 +18,7 @@ const WAIT_TIME: time::Duration = time::Duration::from_millis(100); const POLL_SLEEP_TIME: time::Duration = time::Duration::from_millis(100); fn main() { - simple_logger::init().unwrap(); + SimpleLogger::new().init().unwrap(); 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 index de45adae..a466e889 100644 --- a/examples/cursor.rs +++ b/examples/cursor.rs @@ -1,3 +1,4 @@ +use simple_logger::SimpleLogger; use winit::{ event::{ElementState, Event, KeyboardInput, WindowEvent}, event_loop::{ControlFlow, EventLoop}, @@ -5,7 +6,7 @@ use winit::{ }; fn main() { - simple_logger::init().unwrap(); + SimpleLogger::new().init().unwrap(); 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 index 317577e3..90a94764 100644 --- a/examples/cursor_grab.rs +++ b/examples/cursor_grab.rs @@ -1,3 +1,4 @@ +use simple_logger::SimpleLogger; use winit::{ event::{DeviceEvent, ElementState, Event, KeyboardInput, ModifiersState, WindowEvent}, event_loop::{ControlFlow, EventLoop}, @@ -5,7 +6,7 @@ use winit::{ }; fn main() { - simple_logger::init().unwrap(); + SimpleLogger::new().init().unwrap(); let event_loop = EventLoop::new(); let window = WindowBuilder::new() diff --git a/examples/custom_events.rs b/examples/custom_events.rs index c59299ca..016754b5 100644 --- a/examples/custom_events.rs +++ b/examples/custom_events.rs @@ -1,5 +1,6 @@ #[cfg(not(target_arch = "wasm32"))] fn main() { + use simple_logger::SimpleLogger; use winit::{ event::{Event, WindowEvent}, event_loop::{ControlFlow, EventLoop}, @@ -11,7 +12,7 @@ fn main() { Timer, } - simple_logger::init().unwrap(); + SimpleLogger::new().init().unwrap(); let event_loop = EventLoop::::with_user_event(); let _window = WindowBuilder::new() diff --git a/examples/fullscreen.rs b/examples/fullscreen.rs index 4cdb7b63..3c5ed185 100644 --- a/examples/fullscreen.rs +++ b/examples/fullscreen.rs @@ -1,11 +1,13 @@ use std::io::{stdin, stdout, Write}; + +use simple_logger::SimpleLogger; use winit::event::{ElementState, Event, KeyboardInput, VirtualKeyCode, WindowEvent}; use winit::event_loop::{ControlFlow, EventLoop}; use winit::monitor::{MonitorHandle, VideoMode}; use winit::window::{Fullscreen, WindowBuilder}; fn main() { - simple_logger::init().unwrap(); + SimpleLogger::new().init().unwrap(); let event_loop = EventLoop::new(); print!("Please choose the fullscreen mode: (1) exclusive, (2) borderless: "); diff --git a/examples/handling_close.rs b/examples/handling_close.rs index cbd57053..8334c177 100644 --- a/examples/handling_close.rs +++ b/examples/handling_close.rs @@ -1,3 +1,4 @@ +use simple_logger::SimpleLogger; use winit::{ event::{Event, KeyboardInput, WindowEvent}, event_loop::{ControlFlow, EventLoop}, @@ -5,7 +6,7 @@ use winit::{ }; fn main() { - simple_logger::init().unwrap(); + SimpleLogger::new().init().unwrap(); let event_loop = EventLoop::new(); let _window = WindowBuilder::new() diff --git a/examples/min_max_size.rs b/examples/min_max_size.rs index f4fd00c1..9a58ed6c 100644 --- a/examples/min_max_size.rs +++ b/examples/min_max_size.rs @@ -1,3 +1,4 @@ +use simple_logger::SimpleLogger; use winit::{ dpi::LogicalSize, event::{Event, WindowEvent}, @@ -6,7 +7,7 @@ use winit::{ }; fn main() { - simple_logger::init().unwrap(); + SimpleLogger::new().init().unwrap(); let event_loop = EventLoop::new(); let window = WindowBuilder::new().build(&event_loop).unwrap(); diff --git a/examples/minimize.rs b/examples/minimize.rs index 871cfe2e..eb02a752 100644 --- a/examples/minimize.rs +++ b/examples/minimize.rs @@ -1,11 +1,12 @@ extern crate winit; +use simple_logger::SimpleLogger; use winit::event::{Event, VirtualKeyCode, WindowEvent}; use winit::event_loop::{ControlFlow, EventLoop}; use winit::window::WindowBuilder; fn main() { - simple_logger::init().unwrap(); + SimpleLogger::new().init().unwrap(); let event_loop = EventLoop::new(); let window = WindowBuilder::new() diff --git a/examples/monitor_list.rs b/examples/monitor_list.rs index 66f48baf..9c8b77e6 100644 --- a/examples/monitor_list.rs +++ b/examples/monitor_list.rs @@ -1,7 +1,8 @@ +use simple_logger::SimpleLogger; use winit::{event_loop::EventLoop, window::WindowBuilder}; fn main() { - simple_logger::init().unwrap(); + SimpleLogger::new().init().unwrap(); let event_loop = EventLoop::new(); let window = WindowBuilder::new().build(&event_loop).unwrap(); diff --git a/examples/multithreaded.rs b/examples/multithreaded.rs index 4141775e..5134fbfb 100644 --- a/examples/multithreaded.rs +++ b/examples/multithreaded.rs @@ -2,6 +2,7 @@ fn main() { use std::{collections::HashMap, sync::mpsc, thread, time::Duration}; + use simple_logger::SimpleLogger; use winit::{ dpi::{PhysicalPosition, PhysicalSize, Position, Size}, event::{ElementState, Event, KeyboardInput, VirtualKeyCode, WindowEvent}, @@ -12,7 +13,7 @@ fn main() { const WINDOW_COUNT: usize = 3; const WINDOW_SIZE: PhysicalSize = PhysicalSize::new(600, 400); - simple_logger::init().unwrap(); + SimpleLogger::new().init().unwrap(); 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 index 01c91bb6..ec97eee0 100644 --- a/examples/multiwindow.rs +++ b/examples/multiwindow.rs @@ -1,4 +1,6 @@ use std::collections::HashMap; + +use simple_logger::SimpleLogger; use winit::{ event::{ElementState, Event, KeyboardInput, WindowEvent}, event_loop::{ControlFlow, EventLoop}, @@ -6,7 +8,7 @@ use winit::{ }; fn main() { - simple_logger::init().unwrap(); + SimpleLogger::new().init().unwrap(); let event_loop = EventLoop::new(); let mut windows = HashMap::new(); diff --git a/examples/request_redraw.rs b/examples/request_redraw.rs index 5d761ae4..163f6a14 100644 --- a/examples/request_redraw.rs +++ b/examples/request_redraw.rs @@ -1,3 +1,4 @@ +use simple_logger::SimpleLogger; use winit::{ event::{ElementState, Event, WindowEvent}, event_loop::{ControlFlow, EventLoop}, @@ -5,7 +6,7 @@ use winit::{ }; fn main() { - simple_logger::init().unwrap(); + SimpleLogger::new().init().unwrap(); let event_loop = EventLoop::new(); let window = WindowBuilder::new() diff --git a/examples/request_redraw_threaded.rs b/examples/request_redraw_threaded.rs index 341612ca..1456f254 100644 --- a/examples/request_redraw_threaded.rs +++ b/examples/request_redraw_threaded.rs @@ -1,5 +1,6 @@ use std::{thread, time}; +use simple_logger::SimpleLogger; use winit::{ event::{Event, WindowEvent}, event_loop::{ControlFlow, EventLoop}, @@ -7,7 +8,7 @@ use winit::{ }; fn main() { - simple_logger::init().unwrap(); + SimpleLogger::new().init().unwrap(); let event_loop = EventLoop::new(); let window = WindowBuilder::new() diff --git a/examples/resizable.rs b/examples/resizable.rs index 6a903919..17892d87 100644 --- a/examples/resizable.rs +++ b/examples/resizable.rs @@ -1,3 +1,4 @@ +use simple_logger::SimpleLogger; use winit::{ dpi::LogicalSize, event::{ElementState, Event, KeyboardInput, VirtualKeyCode, WindowEvent}, @@ -6,7 +7,7 @@ use winit::{ }; fn main() { - simple_logger::init().unwrap(); + SimpleLogger::new().init().unwrap(); let event_loop = EventLoop::new(); let mut resizable = false; diff --git a/examples/timer.rs b/examples/timer.rs index 52a1444e..7bbb9685 100644 --- a/examples/timer.rs +++ b/examples/timer.rs @@ -1,5 +1,7 @@ use instant::Instant; use std::time::Duration; + +use simple_logger::SimpleLogger; use winit::{ event::{Event, StartCause, WindowEvent}, event_loop::{ControlFlow, EventLoop}, @@ -7,7 +9,7 @@ use winit::{ }; fn main() { - simple_logger::init().unwrap(); + SimpleLogger::new().init().unwrap(); let event_loop = EventLoop::new(); let _window = WindowBuilder::new() diff --git a/examples/transparent.rs b/examples/transparent.rs index 78e3c4da..c9937cd4 100644 --- a/examples/transparent.rs +++ b/examples/transparent.rs @@ -1,3 +1,4 @@ +use simple_logger::SimpleLogger; use winit::{ event::{Event, WindowEvent}, event_loop::{ControlFlow, EventLoop}, @@ -5,7 +6,7 @@ use winit::{ }; fn main() { - simple_logger::init().unwrap(); + SimpleLogger::new().init().unwrap(); let event_loop = EventLoop::new(); let window = WindowBuilder::new() diff --git a/examples/video_modes.rs b/examples/video_modes.rs index e19a0b03..341f4385 100644 --- a/examples/video_modes.rs +++ b/examples/video_modes.rs @@ -1,7 +1,8 @@ +use simple_logger::SimpleLogger; use winit::event_loop::EventLoop; fn main() { - simple_logger::init().unwrap(); + SimpleLogger::new().init().unwrap(); let event_loop = EventLoop::new(); let monitor = match event_loop.primary_monitor() { Some(monitor) => monitor, diff --git a/examples/window.rs b/examples/window.rs index c028a50f..783578de 100644 --- a/examples/window.rs +++ b/examples/window.rs @@ -1,3 +1,4 @@ +use simple_logger::SimpleLogger; use winit::{ event::{Event, WindowEvent}, event_loop::{ControlFlow, EventLoop}, @@ -5,7 +6,7 @@ use winit::{ }; fn main() { - simple_logger::init().unwrap(); + SimpleLogger::new().init().unwrap(); let event_loop = EventLoop::new(); let window = WindowBuilder::new() diff --git a/examples/window_debug.rs b/examples/window_debug.rs index e8de3cf0..2771b370 100644 --- a/examples/window_debug.rs +++ b/examples/window_debug.rs @@ -1,5 +1,6 @@ // This example is used by developers to test various window functions. +use simple_logger::SimpleLogger; use winit::{ dpi::{LogicalSize, PhysicalSize}, event::{DeviceEvent, ElementState, Event, KeyboardInput, VirtualKeyCode, WindowEvent}, @@ -8,7 +9,7 @@ use winit::{ }; fn main() { - simple_logger::init().unwrap(); + SimpleLogger::new().init().unwrap(); let event_loop = EventLoop::new(); let window = WindowBuilder::new() diff --git a/examples/window_icon.rs b/examples/window_icon.rs index 734debf4..aaa6bc0b 100644 --- a/examples/window_icon.rs +++ b/examples/window_icon.rs @@ -1,5 +1,7 @@ extern crate image; use std::path::Path; + +use simple_logger::SimpleLogger; use winit::{ event::Event, event_loop::{ControlFlow, EventLoop}, @@ -7,7 +9,7 @@ use winit::{ }; fn main() { - simple_logger::init().unwrap(); + SimpleLogger::new().init().unwrap(); // You'll have to choose an icon size at your own discretion. On X11, the desired size varies // by WM, and on Windows, you still have to account for screen scaling. Here we use 32px, diff --git a/examples/window_run_return.rs b/examples/window_run_return.rs index 0112eb3e..066aa054 100644 --- a/examples/window_run_return.rs +++ b/examples/window_run_return.rs @@ -10,6 +10,8 @@ ))] fn main() { use std::{thread::sleep, time::Duration}; + + use simple_logger::SimpleLogger; use winit::{ event::{Event, WindowEvent}, event_loop::{ControlFlow, EventLoop}, @@ -18,7 +20,7 @@ fn main() { }; let mut event_loop = EventLoop::new(); - simple_logger::init().unwrap(); + SimpleLogger::new().init().unwrap(); let _window = WindowBuilder::new() .with_title("A fantastic window!") .build(&event_loop)