Some automated replacements

Result of running:

for NAME in event_loop dpi platform window; do find book src benches examples tests -type f -exec sed -i "s/glutin::$NAME/winit::$NAME/" {} \; ; done

book/tuto-01-getting-started.md

@@ -48,8 +48,8 @@ Initializing an OpenGL window with glutin can be done using the following steps:
 fn main() {
  use glium::glutin;
 
- let mut event_loop = glutin::event_loop::EventLoop::new();
- let wb = glutin::window::WindowBuilder::new();
+ let mut event_loop = winit::event_loop::EventLoop::new();
+ let wb = winit::window::WindowBuilder::new();
  let cb = glutin::ContextBuilder::new();
  let display = glium::Display::new(wb, cb, &event_loop).unwrap();
 }
@@ -61,11 +61,11 @@ But there is a problem: as soon as the window has been created, our main functio
 event_loop.run(move |ev, _, control_flow| {
  let next_frame_time = std::time::Instant::now() +
  std::time::Duration::from_nanos(16_666_667);
- *control_flow = glutin::event_loop::ControlFlow::WaitUntil(next_frame_time);
+ *control_flow = winit::event_loop::ControlFlow::WaitUntil(next_frame_time);
  match ev {
  glutin::event::Event::WindowEvent { event, .. } => match event {
  glutin::event::WindowEvent::CloseRequested => {
- *control_flow = glutin::event_loop::ControlFlow::Exit;
+ *control_flow = winit::event_loop::ControlFlow::Exit;
  return;
  },
  _ => return,
@@ -120,8 +120,8 @@ extern crate glium;
 fn main() {
  use glium::{glutin, Surface};
 
- let event_loop = glutin::event_loop::EventLoop::new();
- let wb = glutin::window::WindowBuilder::new();
+ let event_loop = winit::event_loop::EventLoop::new();
+ let wb = winit::window::WindowBuilder::new();
  let cb = glutin::ContextBuilder::new();
  let display = glium::Display::new(wb, cb, &event_loop).unwrap();
 
@@ -134,11 +134,11 @@ fn main() {
  let next_frame_time = std::time::Instant::now() +
  std::time::Duration::from_nanos(16_666_667);
 
- *control_flow = glutin::event_loop::ControlFlow::WaitUntil(next_frame_time);
+ *control_flow = winit::event_loop::ControlFlow::WaitUntil(next_frame_time);
  match ev {
  glutin::event::Event::WindowEvent { event, .. } => match event {
  glutin::event::WindowEvent::CloseRequested => {
- *control_flow = glutin::event_loop::ControlFlow::Exit;
+ *control_flow = winit::event_loop::ControlFlow::Exit;
  return;
  },
  _ => return,

book/tuto-03-animated-triangle.md

@@ -13,7 +13,7 @@ event_loop.run(move |event, _, control_flow| {
  match event {
  glutin::event::Event::WindowEvent { event, .. } => match event {
  glutin::event::WindowEvent::CloseRequested => {
- *control_flow = glutin::event_loop::ControlFlow::Exit;
+ *control_flow = winit::event_loop::ControlFlow::Exit;
  return;
  },
  _ => return,
@@ -28,7 +28,7 @@ event_loop.run(move |event, _, control_flow| {
 
  let next_frame_time = std::time::Instant::now() +
  std::time::Duration::from_nanos(16_666_667);
- *control_flow = glutin::event_loop::ControlFlow::WaitUntil(next_frame_time);
+ *control_flow = winit::event_loop::ControlFlow::WaitUntil(next_frame_time);
 
  // we update `t`
  t += 0.0002;
@@ -78,7 +78,7 @@ event_loop.run(move |event, _, control_flow| {
  match event {
  glutin::event::Event::WindowEvent { event, .. } => match event {
  glutin::event::WindowEvent::CloseRequested => {
- *control_flow = glutin::event_loop::ControlFlow::Exit;
+ *control_flow = winit::event_loop::ControlFlow::Exit;
  return;
  },
  _ => return,
@@ -93,7 +93,7 @@ event_loop.run(move |event, _, control_flow| {
 
  let next_frame_time = std::time::Instant::now() +
  std::time::Duration::from_nanos(16_666_667);
- *control_flow = glutin::event_loop::ControlFlow::WaitUntil(next_frame_time);
+ *control_flow = winit::event_loop::ControlFlow::WaitUntil(next_frame_time);
 
  // we update `t`
  t += 0.0002;

examples/blitting.rs

@@ -9,8 +9,8 @@ mod support;
 
 fn main() {
  // Building the display, ie. the main object
- let event_loop = glutin::event_loop::EventLoop::new();
- let wb = glutin::window::WindowBuilder::new();
+ let event_loop = winit::event_loop::EventLoop::new();
+ let wb = winit::window::WindowBuilder::new();
  let cb = glutin::ContextBuilder::new().with_vsync(true);
  let display = glium::Display::new(wb, cb, &event_loop).unwrap();
 

examples/compute_image.rs

@@ -19,8 +19,8 @@ use glium::{texture::UnsignedTexture2d, uniform, Surface, Texture2d};
 
 fn main() {
  // building the display, ie. the main object
- let event_loop = glutin::event_loop::EventLoop::new();
- let wb = glutin::window::WindowBuilder::new();
+ let event_loop = winit::event_loop::EventLoop::new();
+ let wb = winit::window::WindowBuilder::new();
  let cb = glutin::ContextBuilder::new()
  .with_vsync(true)
  .with_gl(glutin::GlRequest::Latest);

examples/deferred.rs

@@ -28,9 +28,9 @@ struct Data {
 fn main() {
  use cgmath::SquareMatrix;
 
- let event_loop = glutin::event_loop::EventLoop::new();
- let size: glutin::dpi::LogicalSize<u32> = (800, 500).into();
- let wb = glutin::window::WindowBuilder::new()
+ let event_loop = winit::event_loop::EventLoop::new();
+ let size: winit::dpi::LogicalSize<u32> = (800, 500).into();
+ let wb = winit::window::WindowBuilder::new()
  .with_inner_size(size)
  .with_title("Glium Deferred Example");
  let cb = glutin::ContextBuilder::new();

examples/displacement_mapping.rs

@@ -9,8 +9,8 @@ mod support;
 
 fn main() {
  // building the display, ie. the main object
- let event_loop = glutin::event_loop::EventLoop::new();
- let wb = glutin::window::WindowBuilder::new();
+ let event_loop = winit::event_loop::EventLoop::new();
+ let wb = winit::window::WindowBuilder::new();
  let cb = glutin::ContextBuilder::new();
  let display = glium::Display::new(wb, cb, &event_loop).unwrap();
 

examples/fullscreen.rs

@@ -7,14 +7,14 @@ use glium::Surface;
 use glium::index::PrimitiveType;
 #[allow(unused_imports)]
 use glium::glutin::event::{self, ElementState, VirtualKeyCode, Event, WindowEvent};
-use glium::glutin::window::Fullscreen;
+use glium::winit::window::Fullscreen;
 
 mod support;
 
 fn main() {
  // building the display, ie. the main object
- let event_loop = glutin::event_loop::EventLoop::new();
- let wb = glutin::window::WindowBuilder::new();
+ let event_loop = winit::event_loop::EventLoop::new();
+ let wb = winit::window::WindowBuilder::new();
  let cb = glutin::ContextBuilder::new();
  let display = glium::Display::new(wb, cb, &event_loop).unwrap();
 

examples/fxaa.rs

@@ -229,8 +229,8 @@ fn main() {
  You can use the space bar to switch fxaa on and off.");
 
  // building the display, ie. the main object
- let event_loop = glutin::event_loop::EventLoop::new();
- let wb = glutin::window::WindowBuilder::new();
+ let event_loop = winit::event_loop::EventLoop::new();
+ let wb = winit::window::WindowBuilder::new();
  let cb = glutin::ContextBuilder::new()
  .with_depth_buffer(24)
  .with_vsync(true);

examples/gpgpu.rs

@@ -3,10 +3,10 @@ extern crate glium;
 
 #[allow(unused_imports)]
 use glium::glutin;
-use crate::glutin::dpi::PhysicalSize;
+use crate::winit::dpi::PhysicalSize;
 
 fn main() {
- let event_loop = glium::glutin::event_loop::EventLoop::new();
+ let event_loop = glium::winit::event_loop::EventLoop::new();
  let cb = glutin::ContextBuilder::new();
  let size = PhysicalSize {
  width: 800,

examples/image.rs

@@ -11,8 +11,8 @@ mod support;
 
 fn main() {
  // building the display, ie. the main object
- let event_loop = glutin::event_loop::EventLoop::new();
- let wb = glutin::window::WindowBuilder::new();
+ let event_loop = winit::event_loop::EventLoop::new();
+ let wb = winit::window::WindowBuilder::new();
  let cb = glutin::ContextBuilder::new().with_vsync(true);
  let display = glium::Display::new(wb, cb, &event_loop).unwrap();
 

examples/info.rs

@@ -3,8 +3,8 @@ fn main() {
  use glium::{glutin, Api, Profile, Version};
 
  // building the display, ie. the main object
- let event_loop = glutin::event_loop::EventLoop::new();
- let wb = glutin::window::WindowBuilder::new().with_visible(false);
+ let event_loop = winit::event_loop::EventLoop::new();
+ let wb = winit::window::WindowBuilder::new().with_visible(false);
  let cb = glutin::ContextBuilder::new();
  let display = glium::Display::new(wb, cb, &event_loop).unwrap();
 

examples/instancing.rs

@@ -12,8 +12,8 @@ fn main() {
  teapot at each frame.");
 
  // building the display, ie. the main object
- let event_loop = glutin::event_loop::EventLoop::new();
- let wb = glutin::window::WindowBuilder::new();
+ let event_loop = winit::event_loop::EventLoop::new();
+ let wb = winit::window::WindowBuilder::new();
  let cb = glutin::ContextBuilder::new().with_depth_buffer(24);
  let display = glium::Display::new(wb, cb, &event_loop).unwrap();
 

examples/manual-creation.rs

@@ -28,8 +28,8 @@ use std::os::raw::c_void;
 fn main() {
  // building the glutin window
  // note that it's just `build` and not `build_glium`
- let event_loop = glutin::event_loop::EventLoop::new();
- let wb = glutin::window::WindowBuilder::new();
+ let event_loop = winit::event_loop::EventLoop::new();
+ let wb = winit::window::WindowBuilder::new();
  let cb = glutin::ContextBuilder::new();
  let gl_window = cb.build_windowed(wb, &event_loop).unwrap();
  let gl_window = unsafe {
@@ -105,10 +105,10 @@ fn main() {
  event_loop.run(|event, _, control_flow| {
  *control_flow = match event {
  glutin::event::Event::WindowEvent { event, .. } => match event {
- glutin::event::WindowEvent::CloseRequested => glutin::event_loop::ControlFlow::Exit,
- _ => glutin::event_loop::ControlFlow::Poll,
+ glutin::event::WindowEvent::CloseRequested => winit::event_loop::ControlFlow::Exit,
+ _ => winit::event_loop::ControlFlow::Poll,
  },
- _ => glutin::event_loop::ControlFlow::Poll,
+ _ => winit::event_loop::ControlFlow::Poll,
  }
  });
 }

examples/multiple_windows.rs

@@ -1,5 +1,5 @@
 use glium::glutin::{window::WindowBuilder, ContextBuilder};
-use glium::glutin::event_loop::{EventLoop, ControlFlow};
+use glium::winit::event_loop::{EventLoop, ControlFlow};
 use glium::glutin::event::{Event, WindowEvent, ElementState, MouseButton};
 use glium::{Display, Surface};
 

examples/picking.rs

@@ -16,8 +16,8 @@ implement_vertex!(PerInstance, id, w_position, color);
 
 fn main() {
  // building the display, ie. the main object
- let event_loop = glutin::event_loop::EventLoop::new();
- let wb = glutin::window::WindowBuilder::new();
+ let event_loop = winit::event_loop::EventLoop::new();
+ let wb = winit::window::WindowBuilder::new();
  let cb = glutin::ContextBuilder::new().with_depth_buffer(24);
  let display = glium::Display::new(wb, cb, &event_loop).unwrap();
 

examples/screenshot-asynchronous.rs

@@ -123,8 +123,8 @@ mod screenshot {
 
 fn main() {
  // building the display, ie. the main object
- let event_loop = glutin::event_loop::EventLoop::new();
- let wb = glutin::window::WindowBuilder::new().with_title("Press S to take screenshot");
+ let event_loop = winit::event_loop::EventLoop::new();
+ let wb = winit::window::WindowBuilder::new().with_title("Press S to take screenshot");
  let cb = glutin::ContextBuilder::new();
  let display = glium::Display::new(wb, cb, &event_loop).unwrap();
 
@@ -244,12 +244,12 @@ fn main() {
 
  let next_frame_time = std::time::Instant::now() +
  std::time::Duration::from_nanos(16_666_667);
- *control_flow = glutin::event_loop::ControlFlow::WaitUntil(next_frame_time);
+ *control_flow = winit::event_loop::ControlFlow::WaitUntil(next_frame_time);
 
  match event {
  Event::WindowEvent { event, .. } => match event {
  WindowEvent::CloseRequested => {
- *control_flow = glutin::event_loop::ControlFlow::Exit;
+ *control_flow = winit::event_loop::ControlFlow::Exit;
  return;
  },
  WindowEvent::KeyboardInput { input, .. } => {

examples/screenshot.rs

@@ -7,8 +7,8 @@ use glium::index::PrimitiveType;
 
 fn main() {
  // building the display, ie. the main object
- let event_loop = glutin::event_loop::EventLoop::new();
- let wb = glutin::window::WindowBuilder::new().with_visible(true);
+ let event_loop = winit::event_loop::EventLoop::new();
+ let wb = winit::window::WindowBuilder::new().with_visible(true);
  let cb = glutin::ContextBuilder::new();
  let display = glium::Display::new(wb, cb, &event_loop).unwrap();
 

examples/shadow_mapping.rs

@@ -5,7 +5,7 @@ use cgmath::SquareMatrix;
 #[allow(unused_imports)]
 use glium::{glutin, Surface};
 use std::time::Instant;
-use crate::glutin::dpi::LogicalSize;
+use crate::winit::dpi::LogicalSize;
 
 fn main() {
  let win_size = LogicalSize {
@@ -15,8 +15,8 @@ fn main() {
  let shadow_map_size = 1024;
 
  // Create the main window
- let event_loop = glutin::event_loop::EventLoop::new();
- let wb = glutin::window::WindowBuilder::new()
+ let event_loop = winit::event_loop::EventLoop::new();
+ let wb = winit::window::WindowBuilder::new()
  .with_inner_size(win_size)
  .with_title("Shadow Mapping");
  let cb = glutin::ContextBuilder::new().with_vsync(true);
@@ -163,13 +163,13 @@ fn main() {
 
  let next_frame_time = std::time::Instant::now() +
  std::time::Duration::from_nanos(16_666_667);
- *control_flow = glutin::event_loop::ControlFlow::WaitUntil(next_frame_time);
+ *control_flow = winit::event_loop::ControlFlow::WaitUntil(next_frame_time);
 
  // Handle events
  match event {
  glutin::event::Event::WindowEvent { event, .. } => match event {
  glutin::event::WindowEvent::CloseRequested => {
- *control_flow = glutin::event_loop::ControlFlow::Exit;
+ *control_flow = winit::event_loop::ControlFlow::Exit;
  return;
  },
  glutin::event::WindowEvent::KeyboardInput { input, .. } => if input.state == glutin::event::ElementState::Pressed {

examples/spirv/main.rs

@@ -11,8 +11,8 @@ use glium::program::{ProgramCreationInput, SpirvProgram, SpirvEntryPoint};
 
 fn main() {
  // building the display, ie. the main object
- let event_loop = glutin::event_loop::EventLoop::new();
- let wb = glutin::window::WindowBuilder::new().with_visible(true);
+ let event_loop = winit::event_loop::EventLoop::new();
+ let wb = winit::window::WindowBuilder::new().with_visible(true);
  let cb = glutin::ContextBuilder::new();
  let display = glium::Display::new(wb, cb, &event_loop).unwrap();
 

examples/sprites-batching.rs

@@ -18,8 +18,8 @@ fn main() {
  const SPRITES_COUNT: usize = 1024;
  println!("Number of sprites: {}", SPRITES_COUNT);
 
- let event_loop = glutin::event_loop::EventLoop::new();
- let wb = glutin::window::WindowBuilder::new();
+ let event_loop = winit::event_loop::EventLoop::new();
+ let wb = winit::window::WindowBuilder::new();
  let cb = glutin::ContextBuilder::new();
  let display = glium::Display::new(wb, cb, &event_loop).unwrap();
 

examples/subroutines.rs

@@ -10,8 +10,8 @@ use glium::program::ShaderStage;
 
 fn main() {
  // building the display, ie. the main object
- let event_loop = glutin::event_loop::EventLoop::new();
- let wb = glutin::window::WindowBuilder::new();
+ let event_loop = winit::event_loop::EventLoop::new();
+ let wb = winit::window::WindowBuilder::new();
  let cb = glutin::ContextBuilder::new();
  let display = glium::Display::new(wb, cb, &event_loop).unwrap();
 

examples/support/mod.rs

@@ -2,7 +2,7 @@
 use std::time::{Duration, Instant};
 use glium::{self, Display};
 use glium::vertex::VertexBufferAny;
-use glium::glutin::event_loop::{EventLoop, ControlFlow};
+use glium::winit::event_loop::{EventLoop, ControlFlow};
 use glium::glutin::event::{Event, StartCause};
 
 pub mod camera;

examples/teapot.rs

@@ -8,8 +8,8 @@ mod support;
 
 fn main() {
  // building the display, ie. the main object
- let event_loop = glutin::event_loop::EventLoop::new();
- let wb = glutin::window::WindowBuilder::new();
+ let event_loop = winit::event_loop::EventLoop::new();
+ let wb = winit::window::WindowBuilder::new();
  let cb = glutin::ContextBuilder::new().with_depth_buffer(24);
  let display = glium::Display::new(wb, cb, &event_loop).unwrap();
 

examples/tessellation.rs

@@ -9,8 +9,8 @@ mod support;
 
 fn main() {
  // building the display, ie. the main object
- let event_loop = glutin::event_loop::EventLoop::new();
- let wb = glutin::window::WindowBuilder::new();
+ let event_loop = winit::event_loop::EventLoop::new();
+ let wb = winit::window::WindowBuilder::new();
  let cb = glutin::ContextBuilder::new();
  let display = glium::Display::new(wb, cb, &event_loop).unwrap();