Update dev-dependencies

Cargo.toml

@@ -1,3 +1,3 @@
 [workspace]
 members = ["gfx-glyph", "glyph-brush", "layout", "draw-cache"]
-resolver = "2"
+resolver = "2"

gfx-glyph/Cargo.toml

@@ -20,8 +20,8 @@ log = "0.4"
 cgmath = "0.18"
 env_logger = { version = "0.11", default-features = false }
 gfx_device_gl = "0.16"
-glutin = "0.31"
-glutin-winit = "0.4"
-old_school_gfx_glutin_ext = "0.32"
+glutin = "0.32"
+glutin-winit = "0.5"
+old_school_gfx_glutin_ext = "0.33"
 spin_sleep_util = "0.1"
-winit = "0.29"
+winit = "0.30"

gfx-glyph/examples/depth.rs

@@ -21,7 +21,7 @@ fn main() -> Result<(), Box<dyn Error>> {
     let event_loop = winit::event_loop::EventLoop::new()?;
     event_loop.set_control_flow(ControlFlow::Poll);
     let title = "gfx_glyph example - resize to see multi-text layout";
-    let window_builder = winit::window::WindowBuilder::new()
+    let window_attrs = winit::window::Window::default_attributes()
         .with_title(title)
         .with_inner_size(winit::dpi::PhysicalSize::new(1024, 576));
 
@@ -34,7 +34,7 @@ fn main() -> Result<(), Box<dyn Error>> {
         mut color_view,
         mut depth_view,
         ..
-    } = old_school_gfx_glutin_ext::window_builder(&event_loop, window_builder)
+    } = old_school_gfx_glutin_ext::window_builder(&event_loop, window_attrs)
         .build::<Srgba8, Depth>()?;
 
     let fonts = vec![

gfx-glyph/examples/paragraph.rs

@@ -38,7 +38,7 @@ fn main() -> Result<(), Box<dyn Error>> {
     event_loop.set_control_flow(ControlFlow::Poll);
     let title = "gfx_glyph example - scroll to size, type to modify, ctrl-scroll \
                  to gpu zoom, ctrl-shift-scroll to gpu rotate";
-    let window_builder = winit::window::WindowBuilder::new()
+    let window_attrs = winit::window::Window::default_attributes()
         .with_title(title)
         .with_inner_size(winit::dpi::PhysicalSize::new(1024, 576));
 
@@ -51,7 +51,7 @@ fn main() -> Result<(), Box<dyn Error>> {
         mut color_view,
         mut depth_view,
         ..
-    } = old_school_gfx_glutin_ext::window_builder(&event_loop, window_builder)
+    } = old_school_gfx_glutin_ext::window_builder(&event_loop, window_attrs)
         .build::<Srgba8, Depth>()?;
 
     let font = ab_glyph::FontArc::try_from_slice(include_bytes!("../../fonts/OpenSans-Light.ttf"))?;

gfx-glyph/examples/performance.rs

@@ -31,7 +31,7 @@ fn main() -> Result<(), Box<dyn Error>> {
     let event_loop = winit::event_loop::EventLoop::new()?;
     event_loop.set_control_flow(ControlFlow::Poll);
     let title = "gfx_glyph rendering 30,000 glyphs - scroll to size, type to modify";
-    let window_builder = winit::window::WindowBuilder::new()
+    let window_attrs = winit::window::Window::default_attributes()
         .with_title(title)
         .with_inner_size(winit::dpi::PhysicalSize::new(1024, 576));
 
@@ -44,7 +44,7 @@ fn main() -> Result<(), Box<dyn Error>> {
         mut color_view,
         mut depth_view,
         ..
-    } = old_school_gfx_glutin_ext::window_builder(&event_loop, window_builder)
+    } = old_school_gfx_glutin_ext::window_builder(&event_loop, window_attrs)
         .build::<Srgba8, Depth>()?;
 
     let dejavu = FontRef::try_from_slice(include_bytes!("../../fonts/DejaVuSans.ttf"))?;

gfx-glyph/examples/pre_positioned.rs

@@ -22,7 +22,7 @@ fn main() -> Result<(), Box<dyn Error>> {
     let event_loop = winit::event_loop::EventLoop::new()?;
     event_loop.set_control_flow(ControlFlow::Poll);
     let title = "gfx_glyph example";
-    let window_builder = winit::window::WindowBuilder::new()
+    let window_attrs = winit::window::Window::default_attributes()
         .with_title(title)
         .with_inner_size(winit::dpi::PhysicalSize::new(1024, 576));
 
@@ -35,7 +35,7 @@ fn main() -> Result<(), Box<dyn Error>> {
         mut color_view,
         mut depth_view,
         ..
-    } = old_school_gfx_glutin_ext::window_builder(&event_loop, window_builder)
+    } = old_school_gfx_glutin_ext::window_builder(&event_loop, window_attrs)
         .build::<Srgba8, Depth>()?;
 
     let font: &[u8] = include_bytes!("../../fonts/OpenSans-Light.ttf");

gfx-glyph/examples/varied.rs

@@ -25,7 +25,7 @@ fn main() -> Result<(), Box<dyn Error>> {
     let event_loop = winit::event_loop::EventLoop::new()?;
     event_loop.set_control_flow(ControlFlow::Poll);
     let title = "gfx_glyph example - resize to see multi-text layout";
-    let window_builder = winit::window::WindowBuilder::new()
+    let window_attrs = winit::window::Window::default_attributes()
         .with_title(title)
         .with_inner_size(winit::dpi::PhysicalSize::new(1024, 576));
 
@@ -38,7 +38,7 @@ fn main() -> Result<(), Box<dyn Error>> {
         mut color_view,
         mut depth_view,
         ..
-    } = old_school_gfx_glutin_ext::window_builder(&event_loop, window_builder)
+    } = old_school_gfx_glutin_ext::window_builder(&event_loop, window_attrs)
         .build::<Srgba8, Depth>()?;
 
     let font_0 = FontArc::try_from_slice(include_bytes!("../../fonts/DejaVuSans.ttf"))?;

glyph-brush/Cargo.toml

@@ -26,12 +26,12 @@ approx = "0.5"
 criterion = "0.5"
 env_logger = { version = "0.11", default-features = false }
 gl = "0.14"
-glutin = "0.31"
-glutin-winit = "0.4"
+glutin = "0.32"
+glutin-winit = "0.5"
 once_cell = "1.3"
-raw-window-handle = "0.5"
+raw-window-handle = "0.6"
 spin_sleep_util = "0.1"
-winit = "0.29"
+winit = "0.30"
 
 [[bench]]
 name = "glyph_brush"

glyph-brush/benches/glyph_brush.rs

@@ -277,7 +277,7 @@ fn continually_modify_end_text_of_1_of_3(c: &mut Criterion) {
     let mut brush = GlyphBrushBuilder::using_font(font).build();
     let text = LIPSUM;
 
-    let string_variants = vec![
+    let string_variants = [
         text.to_owned(),
         text.to_owned() + "a",
         text.to_owned() + "ab",
@@ -318,7 +318,7 @@ fn continually_modify_start_text_of_1_of_3(c: &mut Criterion) {
     let mut brush = GlyphBrushBuilder::using_font(font).build();
     let text = LIPSUM;
 
-    let string_variants = vec![
+    let string_variants = [
         text.to_owned(),
         "a".to_owned() + text,
         "ab".to_owned() + text,
@@ -364,7 +364,7 @@ fn continually_modify_middle_text_of_1_of_3(c: &mut Criterion) {
         ci.next().unwrap().0
     };
 
-    let string_variants = vec![
+    let string_variants = [
         text.to_owned(),
         text[..middle_index].to_owned() + "a" + &text[middle_index..],
         text[..middle_index].to_owned() + "ab" + &text[middle_index..],

glyph-brush/examples/draw_cache_guts.rs

@@ -11,7 +11,7 @@ use glutin::{
 use glutin_winit::GlWindow;
 use glyph_brush::{ab_glyph::*, *};
 use opengl::{GlGlyphTexture, GlTextPipe, Res, Vertex};
-use raw_window_handle::HasRawWindowHandle;
+use raw_window_handle::HasWindowHandle;
 use std::{env, ffi::CString, mem, time::Duration};
 use winit::{
     event::{ElementState, Event, KeyEvent, MouseScrollDelta, WindowEvent},
@@ -41,8 +41,8 @@ fn main() -> Res<()> {
     events.set_control_flow(ControlFlow::Poll);
 
     let (window, gl_config) = glutin_winit::DisplayBuilder::new()
-        .with_window_builder(Some(
-            winit::window::WindowBuilder::new()
+        .with_window_attributes(Some(
+            winit::window::Window::default_attributes()
                 .with_inner_size(winit::dpi::PhysicalSize::new(1024, 576))
                 .with_title("draw cache example"),
         ))
@@ -53,20 +53,20 @@ fn main() -> Res<()> {
         })?;
 
     let window = window.unwrap(); // set in display builder
-    let raw_window_handle = window.raw_window_handle();
+    let window_handle = window.window_handle()?;
     let gl_display = gl_config.display();
 
     let context_attributes = glutin::context::ContextAttributesBuilder::new()
         .with_profile(glutin::context::GlProfile::Core)
         .with_context_api(glutin::context::ContextApi::OpenGl(Some(
             glutin::context::Version::new(3, 2),
         )))
-        .build(Some(raw_window_handle));
+        .build(Some(window_handle.as_raw()));
 
     let mut dimensions = window.inner_size();
 
     let (gl_surface, gl_ctx) = {
-        let attrs = window.build_surface_attributes(<_>::default());
+        let attrs = window.build_surface_attributes(<_>::default())?;
         let surface = unsafe { gl_display.create_window_surface(&gl_config, &attrs)? };
         let context = unsafe { gl_display.create_context(&gl_config, &context_attributes)? }
             .make_current(&surface)?;

glyph-brush/examples/opengl.rs

@@ -24,7 +24,7 @@ use glutin::{
 };
 use glutin_winit::GlWindow;
 use glyph_brush::{ab_glyph::*, *};
-use raw_window_handle::HasRawWindowHandle;
+use raw_window_handle::HasWindowHandle;
 use std::{
     env,
     ffi::CString,
@@ -64,8 +64,8 @@ fn main() -> Res<()> {
     events.set_control_flow(ControlFlow::Poll);
 
     let (window, gl_config) = glutin_winit::DisplayBuilder::new()
-        .with_window_builder(Some(
-            winit::window::WindowBuilder::new()
+        .with_window_attributes(Some(
+            winit::window::Window::default_attributes()
                 .with_inner_size(winit::dpi::PhysicalSize::new(1024, 576))
                 .with_title(TITLE),
         ))
@@ -76,20 +76,20 @@ fn main() -> Res<()> {
         })?;
 
     let window = window.unwrap(); // set in display builder
-    let raw_window_handle = window.raw_window_handle();
+    let window_handle = window.window_handle()?;
     let gl_display = gl_config.display();
 
     let context_attributes = glutin::context::ContextAttributesBuilder::new()
         .with_profile(glutin::context::GlProfile::Core)
         .with_context_api(glutin::context::ContextApi::OpenGl(Some(
             glutin::context::Version::new(3, 2),
         )))
-        .build(Some(raw_window_handle));
+        .build(Some(window_handle.as_raw()));
 
     let mut dimensions = window.inner_size();
 
     let (gl_surface, gl_ctx) = {
-        let attrs = window.build_surface_attributes(<_>::default());
+        let attrs = window.build_surface_attributes(<_>::default())?;
         let surface = unsafe { gl_display.create_window_surface(&gl_config, &attrs)? };
         let context = unsafe { gl_display.create_context(&gl_config, &context_attributes)? }
             .make_current(&surface)?;