Skip to content

Commit 8d8d9b7

Browse files
OsspialOsspial
committed
Change instances of "events_loop" to "event_loop"
1 parent 0f34408 commit 8d8d9b7

34 files changed

+137
-116
lines changed

‎examples/cursor.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ use winit::event::{Event, WindowEvent, ElementState, KeyboardInput};
55
use winit::event_loop::{EventLoop, ControlFlow};
66

77
fn main() {
8-
let events_loop = EventLoop::new();
8+
let event_loop = EventLoop::new();
99

10-
let window = WindowBuilder::new().build(&events_loop).unwrap();
10+
let window = WindowBuilder::new().build(&event_loop).unwrap();
1111
window.set_title("A fantastic window!");
1212

1313
let mut cursor_idx = 0;
1414

15-
events_loop.run(move |event, _, control_flow| {
15+
event_loop.run(move |event, _, control_flow| {
1616
match event {
1717
Event::WindowEvent { event: WindowEvent::KeyboardInput { input: KeyboardInput { state: ElementState::Pressed, .. }, .. }, .. } => {
1818
println!("Setting cursor to \"{:?}\"", CURSORS[cursor_idx]);

‎examples/cursor_grab.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ use winit::event::{Event, WindowEvent, ElementState, KeyboardInput};
55
use winit::event_loop::{EventLoop, ControlFlow};
66

77
fn main() {
8-
let events_loop = EventLoop::new();
8+
let event_loop = EventLoop::new();
99

1010
let window = WindowBuilder::new()
1111
.with_title("Super Cursor Grab'n'Hide Simulator 9000")
12-
.build(&events_loop)
12+
.build(&event_loop)
1313
.unwrap();
1414

15-
events_loop.run(move |event, _, control_flow| {
15+
event_loop.run(move |event, _, control_flow| {
1616
*control_flow = ControlFlow::Wait;
1717
if let Event::WindowEvent { event, .. } = event {
1818
match event {

‎examples/fullscreen.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ use winit::event::{Event, WindowEvent, VirtualKeyCode, ElementState, KeyboardInp
66
use winit::event_loop::{EventLoop, ControlFlow};
77

88
fn main() {
9-
let events_loop = EventLoop::new();
9+
let event_loop = EventLoop::new();
1010

1111
// enumerating monitors
1212
let monitor = {
13-
for (num, monitor) in events_loop.get_available_monitors().enumerate() {
13+
for (num, monitor) in event_loop.get_available_monitors().enumerate() {
1414
println!("Monitor #{}: {:?}", num, monitor.get_name());
1515
}
1616

@@ -20,7 +20,7 @@ fn main() {
2020
let mut num = String::new();
2121
io::stdin().read_line(&mut num).unwrap();
2222
let num = num.trim().parse().ok().expect("Please enter a number");
23-
let monitor = events_loop.get_available_monitors().nth(num).expect("Please enter a valid ID");
23+
let monitor = event_loop.get_available_monitors().nth(num).expect("Please enter a valid ID");
2424

2525
println!("Using {:?}", monitor.get_name());
2626

@@ -30,14 +30,14 @@ fn main() {
3030
let window = WindowBuilder::new()
3131
.with_title("Hello world!")
3232
.with_fullscreen(Some(monitor))
33-
.build(&events_loop)
33+
.build(&event_loop)
3434
.unwrap();
3535

3636
let mut is_fullscreen = true;
3737
let mut is_maximized = false;
3838
let mut decorations = true;
3939

40-
events_loop.run(move |event, _, control_flow| {
40+
event_loop.run(move |event, _, control_flow| {
4141
println!("{:?}", event);
4242
*control_flow = ControlFlow::Wait;
4343

‎examples/handling_close.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@ use winit::event::{Event, WindowEvent, KeyboardInput};
55
use winit::event_loop::{EventLoop, ControlFlow};
66

77
fn main() {
8-
let events_loop = EventLoop::new();
8+
let event_loop = EventLoop::new();
99

1010
let _window = WindowBuilder::new()
1111
.with_title("Your faithful window")
12-
.build(&events_loop)
12+
.build(&event_loop)
1313
.unwrap();
1414

1515
let mut close_requested = false;
1616

17-
events_loop.run(move |event, _, control_flow| {
17+
event_loop.run(move |event, _, control_flow| {
1818
use winit::event::ElementState::Released;
1919
use winit::event::VirtualKeyCode::{N, Y};
2020

‎examples/min_max_size.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@ use winit::event::{Event, WindowEvent};
66
use winit::event_loop::{EventLoop, ControlFlow};
77

88
fn main() {
9-
let events_loop = EventLoop::new();
9+
let event_loop = EventLoop::new();
1010

1111
let window = WindowBuilder::new()
12-
.build(&events_loop)
12+
.build(&event_loop)
1313
.unwrap();
1414

1515
window.set_min_dimensions(Some(LogicalSize::new(400.0, 200.0)));
1616
window.set_max_dimensions(Some(LogicalSize::new(800.0, 400.0)));
1717

18-
events_loop.run(move |event, _, control_flow| {
18+
event_loop.run(move |event, _, control_flow| {
1919
println!("{:?}", event);
2020

2121
match event {

‎examples/multiwindow.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ use winit::event::{Event, WindowEvent, ElementState, KeyboardInput};
66
use winit::event_loop::{EventLoop, ControlFlow};
77

88
fn main() {
9-
let events_loop = EventLoop::new();
9+
let event_loop = EventLoop::new();
1010

1111
let mut windows = HashMap::new();
1212
for _ in 0..3 {
13-
let window = Window::new(&events_loop).unwrap();
13+
let window = Window::new(&event_loop).unwrap();
1414
windows.insert(window.id(), window);
1515
}
1616

17-
events_loop.run(move |event, events_loop, control_flow| {
17+
event_loop.run(move |event, event_loop, control_flow| {
1818
*control_flow = ControlFlow::Wait;
1919
match event {
2020
Event::WindowEvent { event, window_id } => {
@@ -30,7 +30,7 @@ fn main() {
3030
}
3131
},
3232
WindowEvent::KeyboardInput { input: KeyboardInput { state: ElementState::Pressed, .. }, .. } => {
33-
let window = Window::new(&events_loop).unwrap();
33+
let window = Window::new(&event_loop).unwrap();
3434
windows.insert(window.id(), window);
3535
},
3636
_ => ()

‎examples/proxy.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,26 @@ use winit::event::{Event, WindowEvent};
44
use winit::event_loop::{EventLoop, ControlFlow};
55

66
fn main() {
7-
let events_loop: EventLoop<i32> = EventLoop::new_user_event();
7+
let event_loop: EventLoop<i32> = EventLoop::new_user_event();
88

99
let _window = WindowBuilder::new()
1010
.with_title("A fantastic window!")
11-
.build(&events_loop)
11+
.build(&event_loop)
1212
.unwrap();
1313

14-
let proxy = events_loop.create_proxy();
14+
let proxy = event_loop.create_proxy();
1515

1616
std::thread::spawn(move || {
1717
let mut counter = 0;
18-
// Wake up the `events_loop` once every second.
18+
// Wake up the `event_loop` once every second.
1919
loop {
2020
std::thread::sleep(std::time::Duration::from_secs(1));
2121
proxy.send_event(counter).unwrap();
2222
counter += 1;
2323
}
2424
});
2525

26-
events_loop.run(move |event, _, control_flow| {
26+
event_loop.run(move |event, _, control_flow| {
2727
println!("{:?}", event);
2828
match event {
2929
Event::WindowEvent { event: WindowEvent::CloseRequested, .. } =>

‎examples/request_redraw.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ use winit::event::{Event, WindowEvent};
66
use winit::event_loop::{EventLoop, ControlFlow};
77

88
fn main() {
9-
let events_loop = EventLoop::new();
9+
let event_loop = EventLoop::new();
1010

1111
let window = WindowBuilder::new()
1212
.with_title("A fantastic window!")
13-
.build(&events_loop)
13+
.build(&event_loop)
1414
.unwrap();
1515

16-
events_loop.run(move |event, _, control_flow| {
16+
event_loop.run(move |event, _, control_flow| {
1717
println!("{:?}", event);
1818

1919
match event {

‎examples/resizable.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@ use winit::event::{Event, WindowEvent, VirtualKeyCode, ElementState, KeyboardInp
44
use winit::event_loop::{EventLoop, ControlFlow};
55

66
fn main() {
7-
let events_loop = EventLoop::new();
7+
let event_loop = EventLoop::new();
88

99
let mut resizable = false;
1010

1111
let window = WindowBuilder::new()
1212
.with_title("Hit space to toggle resizability.")
1313
.with_dimensions((400, 200).into())
1414
.with_resizable(resizable)
15-
.build(&events_loop)
15+
.build(&event_loop)
1616
.unwrap();
1717

18-
events_loop.run(move |event, _, control_flow| {
18+
event_loop.run(move |event, _, control_flow| {
1919
*control_flow = ControlFlow::Wait;
2020
match event {
2121
Event::WindowEvent { event, .. } => match event {

‎examples/timer.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ use winit::event::{Event, WindowEvent, StartCause};
55
use winit::event_loop::{EventLoop, ControlFlow};
66

77
fn main() {
8-
let events_loop = EventLoop::new();
8+
let event_loop = EventLoop::new();
99

1010
let _window = WindowBuilder::new()
1111
.with_title("A fantastic window!")
12-
.build(&events_loop)
12+
.build(&event_loop)
1313
.unwrap();
1414

15-
events_loop.run(move |event, _, control_flow| {
15+
event_loop.run(move |event, _, control_flow| {
1616
println!("{:?}", event);
1717

1818
match event {

‎examples/transparent.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ use winit::event::{Event, WindowEvent};
44
use winit::event_loop::{EventLoop, ControlFlow};
55

66
fn main() {
7-
let events_loop = EventLoop::new();
7+
let event_loop = EventLoop::new();
88

99
let window = WindowBuilder::new().with_decorations(false)
1010
.with_transparency(true)
11-
.build(&events_loop).unwrap();
11+
.build(&event_loop).unwrap();
1212

1313
window.set_title("A fantastic window!");
1414

15-
events_loop.run(move |event, _, control_flow| {
15+
event_loop.run(move |event, _, control_flow| {
1616
println!("{:?}", event);
1717

1818
match event {

‎examples/window.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ use winit::event::{Event, WindowEvent};
44
use winit::event_loop::{EventLoop, ControlFlow};
55

66
fn main() {
7-
let events_loop = EventLoop::new();
7+
let event_loop = EventLoop::new();
88

99
let _window = WindowBuilder::new()
1010
.with_title("A fantastic window!")
11-
.build(&events_loop)
11+
.build(&event_loop)
1212
.unwrap();
1313

14-
events_loop.run(|event, _, control_flow| {
14+
event_loop.run(|event, _, control_flow| {
1515
println!("{:?}", event);
1616

1717
match event {

‎examples/window_icon.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,17 @@ fn main() {
2323
// feature enabled).
2424
let icon = Icon::from_path(path).expect("Failed to open icon");
2525

26-
let events_loop = EventLoop::new();
26+
let event_loop = EventLoop::new();
2727

2828
let window = WindowBuilder::new()
2929
.with_title("An iconic window!")
3030
// At present, this only does anything on Windows and X11, so if you want to save load
3131
// time, you can put icon loading behind a function that returns `None` on other platforms.
3232
.with_window_icon(Some(icon))
33-
.build(&events_loop)
33+
.build(&event_loop)
3434
.unwrap();
3535

36-
events_loop.run(move |event, _, control_flow| {
36+
event_loop.run(move |event, _, control_flow| {
3737
*control_flow = ControlFlow::Wait;
3838
if let Event::WindowEvent { event, .. } = event {
3939
use winit::event::WindowEvent::*;

‎examples/window_run_return.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ use winit::event_loop::{EventLoop, ControlFlow};
66
use winit::platform::desktop::EventLoopExtDesktop;
77

88
fn main() {
9-
let mut events_loop = EventLoop::new();
9+
let mut event_loop = EventLoop::new();
1010

1111
let window = WindowBuilder::new()
1212
.with_title("A fantastic window!")
13-
.build(&events_loop)
13+
.build(&event_loop)
1414
.unwrap();
1515

1616
println!("Close the window to continue.");
17-
events_loop.run_return(|event, _, control_flow| {
17+
event_loop.run_return(|event, _, control_flow| {
1818
match event {
1919
Event::WindowEvent {
2020
event: WindowEvent::CloseRequested,
@@ -27,11 +27,11 @@ fn main() {
2727

2828
let _window_2 = WindowBuilder::new()
2929
.with_title("A second, fantasticer window!")
30-
.build(&events_loop)
30+
.build(&event_loop)
3131
.unwrap();
3232

3333
println!("Wa ha ha! You thought that closing the window would finish this?!");
34-
events_loop.run_return(|event, _, control_flow| {
34+
event_loop.run_return(|event, _, control_flow| {
3535
match event {
3636
Event::WindowEvent {
3737
event: WindowEvent::CloseRequested,

‎src/event_loop.rs

+8-8
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ use monitor::{AvailableMonitorsIter, MonitorId};
3030
/// `Window` created from this `EventLoop` _can_ be sent to an other thread, and the
3131
/// `EventLoopProxy` allows you to wakeup an `EventLoop` from an other thread.
3232
pub struct EventLoop<T> {
33-
pub(crate) events_loop: platform_impl::EventLoop<T>,
33+
pub(crate) event_loop: platform_impl::EventLoop<T>,
3434
pub(crate) _marker: ::std::marker::PhantomData<*mut ()> // Not Send nor Sync
3535
}
3636

@@ -85,7 +85,7 @@ impl<T> EventLoop<T> {
8585
/// fallback on x11. If this variable is set with any other value, winit will panic.
8686
pub fn new_user_event() -> EventLoop<T> {
8787
EventLoop {
88-
events_loop: platform_impl::EventLoop::new(),
88+
event_loop: platform_impl::EventLoop::new(),
8989
_marker: ::std::marker::PhantomData,
9090
}
9191
}
@@ -95,14 +95,14 @@ impl<T> EventLoop<T> {
9595
// Note: should be replaced with `-> impl Iterator` once stable.
9696
#[inline]
9797
pub fn get_available_monitors(&self) -> AvailableMonitorsIter {
98-
let data = self.events_loop.get_available_monitors();
98+
let data = self.event_loop.get_available_monitors();
9999
AvailableMonitorsIter{ data: data.into_iter() }
100100
}
101101

102102
/// Returns the primary monitor of the system.
103103
#[inline]
104104
pub fn get_primary_monitor(&self) -> MonitorId {
105-
MonitorId { inner: self.events_loop.get_primary_monitor() }
105+
MonitorId { inner: self.event_loop.get_primary_monitor() }
106106
}
107107

108108
/// Hijacks the calling thread and initializes the `winit` event loop with the provided
@@ -114,22 +114,22 @@ impl<T> EventLoop<T> {
114114
pub fn run<F>(self, event_handler: F) -> !
115115
where F: 'static + FnMut(Event<T>, &EventLoop<T>, &mut ControlFlow)
116116
{
117-
self.events_loop.run(event_handler)
117+
self.event_loop.run(event_handler)
118118
}
119119

120120
/// Creates an `EventLoopProxy` that can be used to wake up the `EventLoop` from another
121121
/// thread.
122122
pub fn create_proxy(&self) -> EventLoopProxy<T> {
123123
EventLoopProxy {
124-
events_loop_proxy: self.events_loop.create_proxy(),
124+
event_loop_proxy: self.event_loop.create_proxy(),
125125
}
126126
}
127127
}
128128

129129
/// Used to send custom events to `EventLoop`.
130130
#[derive(Clone)]
131131
pub struct EventLoopProxy<T> {
132-
events_loop_proxy: platform_impl::EventLoopProxy<T>,
132+
event_loop_proxy: platform_impl::EventLoopProxy<T>,
133133
}
134134

135135
impl<T> EventLoopProxy<T> {
@@ -139,7 +139,7 @@ impl<T> EventLoopProxy<T> {
139139
///
140140
/// Returns an `Err` if the associated `EventLoop` no longer exists.
141141
pub fn send_event(&self, event: T) -> Result<(), EventLoopClosed> {
142-
self.events_loop_proxy.send_event(event)
142+
self.event_loop_proxy.send_event(event)
143143
}
144144
}
145145

0 commit comments

Comments
 (0)