Merge pull request #257 from linkmauve/eijebong

Bump almost all dependencies to their latest version

c/Cargo.toml

@@ -9,9 +9,9 @@ build = "build.rs"
 crate-type = ["staticlib"]
 
 [dependencies]
-font-kit = "0.4"
-foreign-types = "0.3"
-gl = "0.6"
+font-kit = "0.5"
+foreign-types = "0.5"
+gl = "0.14"
 libc = "0.2"
 
 [dependencies.pathfinder_canvas]
@@ -46,4 +46,4 @@ metal = "0.17"
 path = "../metal"
 
 [build-dependencies]
-cbindgen = "0.8"
+cbindgen = "0.13"

c/src/lib.rs

@@ -11,7 +11,6 @@
 //! C bindings to Pathfinder.
 
 use font_kit::handle::Handle;
-use foreign_types::ForeignTypeRef;
 use gl;
 use pathfinder_canvas::{CanvasFontContext, CanvasRenderingContext2D, FillStyle, LineJoin, Path2D};
 use pathfinder_canvas::{TextAlign, TextMetrics};

canvas/Cargo.toml

@@ -8,7 +8,7 @@ edition = "2018"
 crate-type = ["rlib", "staticlib"]
 
 [dependencies]
-font-kit = { version = "0.4", optional = true }
+font-kit = { version = "0.5", optional = true }
 
 [dependencies.pathfinder_color]
 path = "../color"
@@ -28,7 +28,7 @@ optional = true
 
 [dependencies.skribo]
 git = "https://github.com/linebender/skribo.git"
-rev = "03c63ac17bb93e29f82e959dac94027935a21159"
+rev = "f306037c36f596bba45cb9fd698ea53b6ca65e2e"
 optional = true
 [features]
 pf-text = ["pathfinder_text", "skribo", "font-kit"]

content/Cargo.toml

@@ -5,10 +5,10 @@ authors = ["Patrick Walton <pcwalton@mimiga.net>"]
 edition = "2018"
 
 [dependencies]
-arrayvec = "0.4"
+arrayvec = "0.5"
 bitflags = "1.0"
 log = "0.4"
-smallvec = "0.6"
+smallvec = "1.2"
 
 [dependencies.pathfinder_color]
 path = "../color"

demo/android/rust/Cargo.toml

@@ -9,8 +9,8 @@ crate_type = ["cdylib"]
 
 [dependencies]
 egl = "0.2"
-gl = "0.6"
-jni = "0.11"
+gl = "0.14"
+jni = "0.14"
 lazy_static = "1.3"
 
 [dependencies.pathfinder_demo]

demo/common/Cargo.toml

@@ -9,12 +9,12 @@ pf-gl = []
 
 [dependencies]
 clap = "2.32"
-gl = "0.6"
+gl = "0.14"
 rayon = "1.0"
-usvg = "0.8"
+usvg = "0.9"
 
 [dependencies.image]
-version = "0.21"
+version = "0.22"
 default-features = false
 features = ["png_codec"]
 

demo/magicleap/Cargo.toml

@@ -5,14 +5,14 @@ edition = "2018"
 authors = ["Alan Jeffrey <ajeffrey@mozilla.com>"]
 
 [dependencies]
-gl = "0.6"
+gl = "0.14"
 rayon = "1.0"
-usvg = "0.8"
+usvg = "0.9"
 egl = "0.2"
 log = "0.4"
-smallvec = "0.6"
-glutin = { version = "0.19", optional = true }
-crossbeam-channel = "0.3"
+smallvec = "1.2"
+glutin = { version = "0.22", optional = true }
+crossbeam-channel = "0.4"
 
 [lib]
 crate-type = ["cdylib"]

demo/native/Cargo.toml

@@ -9,12 +9,12 @@ pf-gl = ["pathfinder_demo/pf-gl"]
 pf-no-simd = ["pathfinder_simd/pf-no-simd"]
 
 [dependencies]
-color-backtrace = "0.1"
-gl = "0.6"
+color-backtrace = "0.3"
+gl = "0.14"
 nfd = "0.0.4"
-pretty_env_logger = "0.3"
-sdl2 = "0.32"
-sdl2-sys = "0.32"
+pretty_env_logger = "0.4"
+sdl2 = "0.33"
+sdl2-sys = "0.33"
 
 [dependencies.pathfinder_demo]
 path = "../common"
@@ -32,11 +32,11 @@ path = "../../gpu"
 path = "../../simd"
 
 [target.'cfg(target_os = "macos")'.dependencies]
-foreign-types = "0.3"
+foreign-types = "0.5"
 metal = "0.17"
 
 [target.'cfg(target_os = "macos")'.dependencies.pathfinder_metal]
 path = "../../metal"
 
 [target.'cfg(not(windows))'.dependencies]
-jemallocator = "0.1"
+jemallocator = "0.3"

examples/canvas_glutin_minimal/Cargo.toml

@@ -5,8 +5,8 @@ authors = ["Patrick Walton <pcwalton@mimiga.net>"]
 edition = "2018"
 
 [dependencies]
-gl = "0.6"
-glutin = "0.21"
+gl = "0.14"
+glutin = "0.22"
 
 [dependencies.pathfinder_canvas]
 path = "../../canvas"

examples/canvas_glutin_minimal/src/main.rs

@@ -11,8 +11,10 @@
 //! Demonstrates how to use the Pathfinder canvas API with `glutin`.
 
 use glutin::dpi::PhysicalSize;
-use glutin::{ContextBuilder, ControlFlow, Event, EventsLoop, GlProfile, GlRequest, KeyboardInput};
-use glutin::{VirtualKeyCode, WindowBuilder, WindowEvent};
+use glutin::{ContextBuilder, GlProfile, GlRequest};
+use glutin::event_loop::{ControlFlow, EventLoop};
+use glutin::event::{Event, KeyboardInput, VirtualKeyCode, WindowEvent};
+use glutin::window::WindowBuilder;
 use pathfinder_canvas::{CanvasFontContext, CanvasRenderingContext2D, Path2D};
 use pathfinder_color::ColorF;
 use pathfinder_geometry::rect::RectF;
@@ -27,15 +29,13 @@ use pathfinder_renderer::options::BuildOptions;
 
 fn main() {
     // Calculate the right logical size of the window.
-    let mut event_loop = EventsLoop::new();
-    let hidpi_factor = event_loop.get_primary_monitor().get_hidpi_factor();
+    let event_loop = EventLoop::new();
     let window_size = Vector2I::new(640, 480);
     let physical_window_size = PhysicalSize::new(window_size.x() as f64, window_size.y() as f64);
-    let logical_window_size = physical_window_size.to_logical(hidpi_factor);
 
     // Open a window.
     let window_builder = WindowBuilder::new().with_title("Minimal example")
-                                             .with_dimensions(logical_window_size);
+                                             .with_inner_size(physical_window_size);
 
     // Create an OpenGL 3.x context for Pathfinder to use.
     let gl_context = ContextBuilder::new().with_gl(GlRequest::Latest)
@@ -80,7 +80,7 @@ fn main() {
     gl_context.swap_buffers().unwrap();
 
     // Wait for a keypress.
-    event_loop.run_forever(|event| {
+    event_loop.run(move |event, _, control_flow| {
         match event {
             Event::WindowEvent { event: WindowEvent::CloseRequested, .. } |
             Event::WindowEvent {
@@ -89,8 +89,12 @@ fn main() {
                     ..
                 },
                 ..
-            } => ControlFlow::Break,
-            _ => ControlFlow::Continue,
-        }
+            } => {
+                *control_flow = ControlFlow::Exit;
+            },
+            _ => {
+                *control_flow = ControlFlow::Wait;
+            },
+        };
     })
 }

examples/canvas_metal_minimal/Cargo.toml

@@ -5,12 +5,12 @@ authors = ["Patrick Walton <pcwalton@mimiga.net>"]
 edition = "2018"
 
 [dependencies]
-foreign-types = "0.3"
-gl = "0.6"
+foreign-types = "0.5"
+gl = "0.14"
 metal = "0.17"
 objc = "0.2"
-sdl2 = "0.32"
-sdl2-sys = "0.32"
+sdl2 = "0.33"
+sdl2-sys = "0.33"
 
 [dependencies.pathfinder_canvas]
 features = ["pf-text"]

examples/canvas_minimal/Cargo.toml

@@ -5,9 +5,9 @@ authors = ["Patrick Walton <pcwalton@mimiga.net>"]
 edition = "2018"
 
 [dependencies]
-gl = "0.6"
-sdl2 = "0.32"
-sdl2-sys = "0.32"
+gl = "0.14"
+sdl2 = "0.33"
+sdl2-sys = "0.33"
 
 [dependencies.pathfinder_canvas]
 path = "../../canvas"

examples/canvas_moire/Cargo.toml

@@ -5,9 +5,9 @@ authors = ["Patrick Walton <pcwalton@mimiga.net>"]
 edition = "2018"
 
 [dependencies]
-gl = "0.6"
-sdl2 = "0.32"
-sdl2-sys = "0.32"
+gl = "0.14"
+sdl2 = "0.33"
+sdl2-sys = "0.33"
 
 [dependencies.pathfinder_canvas]
 features = ["pf-text"]

examples/canvas_text/Cargo.toml

@@ -5,10 +5,10 @@ authors = ["Patrick Walton <pcwalton@mimiga.net>"]
 edition = "2018"
 
 [dependencies]
-font-kit = "0.4"
-gl = "0.6"
-sdl2 = "0.32"
-sdl2-sys = "0.32"
+font-kit = "0.5"
+gl = "0.14"
+sdl2 = "0.33"
+sdl2-sys = "0.33"
 
 [dependencies.pathfinder_canvas]
 features = ["pf-text"]

examples/swf_basic/Cargo.toml

@@ -5,12 +5,12 @@ authors = ["Jon Hardie <jon@hardiesoft.com>"]
 edition = "2018"
 
 [dependencies]
-gl = "0.6"
-sdl2 = "0.32"
-sdl2-sys = "0.32"
+gl = "0.14"
+sdl2 = "0.33"
+sdl2-sys = "0.33"
 
-swf-parser = "0.7.0"
-swf-tree = "0.7.0"
+swf-parser = "0.10"
+swf-types = "0.10"
 
 [dependencies.pathfinder_geometry]
 path = "../../geometry"

examples/swf_basic/src/main.rs

@@ -63,7 +63,7 @@ fn main() {
         swf_bytes = Vec::from(&default_tiger[..]);
     }
 
-    let (_, movie): (_, swf_tree::Movie) = swf_parser::parsers::movie::parse_movie(&swf_bytes[..]).unwrap();
+    let (_, movie): (_, swf_types::Movie) = swf_parser::streaming::movie::parse_movie(&swf_bytes[..]).unwrap();
 
     // Set up SDL2.
     let sdl_context = sdl2::init().unwrap();

gl/Cargo.toml

@@ -8,7 +8,7 @@ authors = ["Patrick Walton <pcwalton@mimiga.net>"]
 crate-type = ["rlib", "staticlib"]
 
 [dependencies]
-gl = "0.6"
+gl = "0.14"
 half = "1.4"
 
 [dependencies.log]

gpu/Cargo.toml

@@ -8,7 +8,7 @@ edition = "2018"
 half = "1.4"
 
 [dependencies.image]
-version = "0.21"
+version = "0.22"
 default-features = false
 features = ["png_codec"]
 

metal/Cargo.toml

@@ -8,9 +8,9 @@ edition = "2018"
 bitflags = "1.0"
 byteorder = "1.3"
 block = "0.1"
-cocoa = "0.19"
-core-foundation = "0.6"
-foreign-types = "0.3"
+cocoa = "0.20"
+core-foundation = "0.7"
+foreign-types = "0.5"
 half = "1.4"
 metal = "0.17"
 objc = "0.2"

renderer/Cargo.toml

@@ -7,11 +7,11 @@ authors = ["Patrick Walton <pcwalton@mimiga.net>"]
 [dependencies]
 bitflags = "1.0"
 byteorder = "1.2"
-hashbrown = "0.1"
+hashbrown = "0.7"
 rayon = "1.0"
 serde = "1.0"
 serde_json = "1.0"
-smallvec = "0.6"
+smallvec = "1.2"
 
 [dependencies.log]
 version = "0.4"
@@ -36,4 +36,4 @@ path = "../simd"
 path = "../ui"
 
 [dev-dependencies]
-quickcheck = "0.8"
+quickcheck = "0.9"

svg/Cargo.toml

@@ -6,7 +6,7 @@ authors = ["Patrick Walton <pcwalton@mimiga.net>"]
 
 [dependencies]
 bitflags = "1.0"
-usvg = "0.8"
+usvg = "0.9"
 
 [dependencies.pathfinder_color]
 path = "../color"

swf/Cargo.toml

@@ -5,8 +5,8 @@ authors = ["Jon Hardie <jon@hardiesoft.com>"]
 edition = "2018"
 
 [dependencies]
-swf-parser = "0.7.0"
-swf-tree = "0.7.0"
+swf-parser = "0.10"
+swf-types = "0.10"
 
 [dependencies.pathfinder_color]
 path = "../color"

swf/src/lib.rs

@@ -15,9 +15,8 @@ use pathfinder_content::stroke::{OutlineStrokeToFill, StrokeStyle};
 use pathfinder_geometry::vector::Vector2F;
 use pathfinder_renderer::scene::{PathObject, Scene};
 
-use swf_tree;
-use swf_tree::tags::SetBackgroundColor;
-use swf_tree::{Tag, SRgb8, Movie};
+use swf_types::tags::SetBackgroundColor;
+use swf_types::{Tag, SRgb8, Movie};
 
 use crate::shapes::{GraphicLayers, PaintOrLine};
 
@@ -138,7 +137,7 @@ pub fn process_swf_tags(movie: &Movie) -> (SymbolLibrary, Stage) {
                 stage.background_color = *color;
             },
             Tag::DefineShape(shape) => {
-                symbol_library.add_symbol(Symbol::Graphic(shapes::decode_shape(&shape)));
+                symbol_library.add_symbol(Symbol::Graphic(shapes::decode_shape(shape)));
                 // We will assume that symbol ids just go up, and are 1 based.
                 let symbol_id: SymbolId = shape.id;
                 debug_assert!(symbol_id as usize == symbol_library.0.len());

swf/src/shapes.rs

@@ -15,9 +15,9 @@ use pathfinder_content::stroke::{LineJoin, LineCap};
 use pathfinder_renderer::paint::Paint;
 use std::cmp::Ordering;
 use std::mem;
-use swf_tree::tags::DefineShape;
-use swf_tree::{CapStyle, FillStyle, JoinStyle, LineStyle, ShapeRecord, StraightSRgba8, Vector2D};
-use swf_tree::{fill_styles, join_styles, shape_records};
+use swf_types::tags::DefineShape;
+use swf_types::{CapStyle, FillStyle, JoinStyle, LineStyle, ShapeRecord, StraightSRgba8, Vector2D};
+use swf_types::{fill_styles, join_styles, shape_records};
 
 #[derive(Clone, Copy, Debug)]
 pub(crate) struct LineSegment {

text/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2018"
 
 [dependencies]
 euclid = "0.20"
-font-kit = "0.4"
+font-kit = "0.5"
 lyon_path = "0.14"
 
 [dependencies.pathfinder_content]
@@ -20,4 +20,4 @@ path = "../renderer"
 
 [dependencies.skribo]
 git = "https://github.com/linebender/skribo.git"
-rev = "03c63ac17bb93e29f82e959dac94027935a21159"
+rev = "f306037c36f596bba45cb9fd698ea53b6ca65e2e"

ui/Cargo.toml

@@ -10,7 +10,7 @@ serde_derive = "1.0"
 serde_json = "1.0"
 
 [dependencies.hashbrown]
-version = "0.1"
+version = "0.7"
 features = ["serde"]
 
 [dependencies.pathfinder_color]

utils/area-lut/Cargo.toml

@@ -5,5 +5,5 @@ authors = ["Patrick Walton <pcwalton@mimiga.net>"]
 
 [dependencies]
 clap = "2.30"
-euclid = "0.19"
-image = "0.19"
+euclid = "0.20"
+image = "0.22"

utils/area-lut/src/main.rs

@@ -5,7 +5,7 @@ extern crate euclid;
 extern crate image;
 
 use clap::{App, Arg};
-use euclid::Point2D;
+use euclid::default::Point2D;
 use image::{ImageBuffer, Luma};
 use std::f32;
 use std::path::Path;

utils/convert/Cargo.toml

@@ -9,4 +9,4 @@ edition = "2018"
 [dependencies]
 pathfinder_export = { path = "../../export" }
 pathfinder_svg = { path = "../../svg" }
-usvg = "0.8"
+usvg = "0.9"

utils/gamma-lut/Cargo.toml

@@ -5,5 +5,5 @@ authors = ["Patrick Walton <pcwalton@mimiga.net>"]
 
 [dependencies]
 clap = "2.27"
-image = "0.19"
-log = "0.3"
+log = "0.4"
+image = "0.22"

utils/svg-to-skia/Cargo.toml

@@ -5,4 +5,4 @@ authors = ["Patrick Walton <pcwalton@mimiga.net>"]
 edition = "2018"
 
 [dependencies]
-usvg = "0.8"
+usvg = "0.9"