From 8d00cdb64cd14103dbab71197c0c7599d8f5c2f4 Mon Sep 17 00:00:00 2001 From: Joonas Javanainen Date: Sun, 7 Jul 2019 14:32:44 +0300 Subject: [PATCH] Upgrade dependencies --- Cargo.toml | 2 +- imgui-examples/Cargo.lock | 20 ++++++++++---------- imgui-gfx-examples/Cargo.lock | 14 +++++++------- imgui-sys-bindgen/Cargo.toml | 2 +- src/fonts/atlas.rs | 3 ++- src/fonts/font.rs | 3 ++- src/fonts/glyph.rs | 3 ++- src/internal.rs | 6 ++++-- src/io.rs | 3 ++- src/render/draw_data.rs | 6 ++++-- src/style.rs | 3 ++- 11 files changed, 37 insertions(+), 28 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 9fb215776..4ee28e9fd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,7 +22,7 @@ lazy_static = "1.1" parking_lot = "0.8" [dev-dependencies] -memoffset = "0.3" +memoffset = "0.4" [workspace] members = [ diff --git a/imgui-examples/Cargo.lock b/imgui-examples/Cargo.lock index 677fca6b9..90cc4578d 100644 --- a/imgui-examples/Cargo.lock +++ b/imgui-examples/Cargo.lock @@ -49,7 +49,7 @@ name = "backtrace" version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "backtrace-sys 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", + "backtrace-sys 0.1.30 (registry+https://github.com/rust-lang/crates.io-index)", "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-demangle 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", @@ -57,7 +57,7 @@ dependencies = [ [[package]] name = "backtrace-sys" -version = "0.1.29" +version = "0.1.30" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", @@ -191,7 +191,7 @@ dependencies = [ [[package]] name = "deflate" -version = "0.7.19" +version = "0.7.20" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "adler32 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -386,7 +386,7 @@ dependencies = [ [[package]] name = "imgui-examples" -version = "0.1.0-pre" +version = "0.0.0" dependencies = [ "glium 0.25.0 (registry+https://github.com/rust-lang/crates.io-index)", "image 0.21.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -663,7 +663,7 @@ dependencies = [ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", - "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)", + "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -685,7 +685,7 @@ version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "deflate 0.7.19 (registry+https://github.com/rust-lang/crates.io-index)", + "deflate 0.7.20 (registry+https://github.com/rust-lang/crates.io-index)", "inflate 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", "num-iter 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -834,7 +834,7 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.1.54" +version = "0.1.56" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -1118,7 +1118,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "92c7fb76bc8826a8b33b4ee5bb07a247a81e76764ab4d55e8f73e3a4d8808c71" "checksum autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "0e49efa51329a5fd37e7c79db4621af617cd4e3e5bc224939808d076077077bf" "checksum backtrace 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)" = "18b50f5258d1a9ad8396d2d345827875de4261b158124d4c819d9b351454fae5" -"checksum backtrace-sys 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)" = "12cb9f1eef1d1fc869ad5a26c9fa48516339a15e54a227a25460fc304815fdb3" +"checksum backtrace-sys 0.1.30 (registry+https://github.com/rust-lang/crates.io-index)" = "5b3a000b9c543553af61bc01cbfc403b04b5caa9e421033866f2e98061eb3e61" "checksum bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3d155346769a6855b86399e9bc3814ab343cd3d62c7e985113d46a0ec3c281fd" "checksum block 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" "checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5" @@ -1135,7 +1135,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum crossbeam-epoch 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "04c9e3102cc2d69cd681412141b390abd55a362afc1540965dad0ad4d34280b4" "checksum crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7c979cd6cfe72335896575c6b5688da489e420d36a27a0b9eb0c73db574b4a4b" "checksum crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "f8306fcef4a7b563b76b7dd949ca48f52bc1141aa067d2ea09565f3e2652aa5c" -"checksum deflate 0.7.19 (registry+https://github.com/rust-lang/crates.io-index)" = "8a6abb26e16e8d419b5c78662aa9f82857c2386a073da266840e474d5055ec86" +"checksum deflate 0.7.20 (registry+https://github.com/rust-lang/crates.io-index)" = "707b6a7b384888a70c8d2e8650b3e60170dfc6a67bb4aa67b6dfca57af4bedb4" "checksum derivative 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6073e9676dbebdddeabaeb63e3b7cefd23c86f5c41d381ee1237cc77b1079898" "checksum dlib 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "77e51249a9d823a4cb79e3eca6dcd756153e8ed0157b6c04775d04bf1b13b76a" "checksum downcast-rs 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "f2b92dfd5c2f75260cbf750572f95d387e7ca0ba5e3fbe9e1a33f23025be020f" @@ -1203,7 +1203,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum rayon 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a4b0186e22767d5b9738a05eab7c6ac90b15db17e5b5f9bd87976dd7d89a10a4" "checksum rayon-core 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ebbe0df8435ac0c397d467b6cad6d25543d06e8a019ef3f6af3c384597515bd2" "checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" -"checksum redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)" = "12229c14a0f65c4f1cb046a3b52047cdd9da1f4b30f8a39c5063c8bae515e252" +"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" "checksum rustc-demangle 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "a7f4dccf6f4891ebcc0c39f9b6eb1a83b9bf5d747cb439ec6fba4f3b977038af" "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" "checksum rusttype 0.7.7 (registry+https://github.com/rust-lang/crates.io-index)" = "654103d61a05074b268a107cf6581ce120f0fc0115f2610ed9dfea363bb81139" diff --git a/imgui-gfx-examples/Cargo.lock b/imgui-gfx-examples/Cargo.lock index 1dd402fd1..5e4c9e2e1 100644 --- a/imgui-gfx-examples/Cargo.lock +++ b/imgui-gfx-examples/Cargo.lock @@ -49,7 +49,7 @@ name = "backtrace" version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "backtrace-sys 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", + "backtrace-sys 0.1.30 (registry+https://github.com/rust-lang/crates.io-index)", "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-demangle 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", @@ -57,7 +57,7 @@ dependencies = [ [[package]] name = "backtrace-sys" -version = "0.1.29" +version = "0.1.30" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)", @@ -447,7 +447,7 @@ dependencies = [ [[package]] name = "imgui-gfx-examples" -version = "0.1.0-pre" +version = "0.0.0" dependencies = [ "gfx 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)", "gfx_device_dx11 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -730,7 +730,7 @@ dependencies = [ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", - "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)", + "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -901,7 +901,7 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.1.54" +version = "0.1.56" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -1180,7 +1180,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "92c7fb76bc8826a8b33b4ee5bb07a247a81e76764ab4d55e8f73e3a4d8808c71" "checksum autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "0e49efa51329a5fd37e7c79db4621af617cd4e3e5bc224939808d076077077bf" "checksum backtrace 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)" = "18b50f5258d1a9ad8396d2d345827875de4261b158124d4c819d9b351454fae5" -"checksum backtrace-sys 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)" = "12cb9f1eef1d1fc869ad5a26c9fa48516339a15e54a227a25460fc304815fdb3" +"checksum backtrace-sys 0.1.30 (registry+https://github.com/rust-lang/crates.io-index)" = "5b3a000b9c543553af61bc01cbfc403b04b5caa9e421033866f2e98061eb3e61" "checksum bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3d155346769a6855b86399e9bc3814ab343cd3d62c7e985113d46a0ec3c281fd" "checksum block 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" "checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5" @@ -1271,7 +1271,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum rayon 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a4b0186e22767d5b9738a05eab7c6ac90b15db17e5b5f9bd87976dd7d89a10a4" "checksum rayon-core 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ebbe0df8435ac0c397d467b6cad6d25543d06e8a019ef3f6af3c384597515bd2" "checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" -"checksum redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)" = "12229c14a0f65c4f1cb046a3b52047cdd9da1f4b30f8a39c5063c8bae515e252" +"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" "checksum rustc-demangle 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "a7f4dccf6f4891ebcc0c39f9b6eb1a83b9bf5d747cb439ec6fba4f3b977038af" "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" "checksum rusttype 0.7.7 (registry+https://github.com/rust-lang/crates.io-index)" = "654103d61a05074b268a107cf6581ce120f0fc0115f2610ed9dfea363bb81139" diff --git a/imgui-sys-bindgen/Cargo.toml b/imgui-sys-bindgen/Cargo.toml index 196bcce25..bc07b2eb3 100644 --- a/imgui-sys-bindgen/Cargo.toml +++ b/imgui-sys-bindgen/Cargo.toml @@ -9,7 +9,7 @@ license = "MIT/Apache-2.0" publish = false [dependencies] -bindgen = "0.49" +bindgen = "0.50" failure = "0.1" serde = "1.0" serde_derive = "1.0" diff --git a/src/fonts/atlas.rs b/src/fonts/atlas.rs index 723035be6..16e57e417 100644 --- a/src/fonts/atlas.rs +++ b/src/fonts/atlas.rs @@ -232,9 +232,10 @@ fn test_font_atlas_memory_layout() { mem::align_of::() ); use memoffset::offset_of; + use sys::ImFontAtlas; macro_rules! assert_field_offset { ($l:ident, $r:ident) => { - assert_eq!(offset_of!(FontAtlas, $l), offset_of!(sys::ImFontAtlas, $r)); + assert_eq!(offset_of!(FontAtlas, $l), offset_of!(ImFontAtlas, $r)); }; }; assert_field_offset!(locked, Locked); diff --git a/src/fonts/font.rs b/src/fonts/font.rs index 42ea5be1e..2c90fb29b 100644 --- a/src/fonts/font.rs +++ b/src/fonts/font.rs @@ -39,9 +39,10 @@ fn test_font_memory_layout() { assert_eq!(mem::size_of::(), mem::size_of::()); assert_eq!(mem::align_of::(), mem::align_of::()); use memoffset::offset_of; + use sys::ImFont; macro_rules! assert_field_offset { ($l:ident, $r:ident) => { - assert_eq!(offset_of!(Font, $l), offset_of!(sys::ImFont, $r)); + assert_eq!(offset_of!(Font, $l), offset_of!(ImFont, $r)); }; }; assert_field_offset!(index_advance_x, IndexAdvanceX); diff --git a/src/fonts/glyph.rs b/src/fonts/glyph.rs index 08582f4d0..417d3868c 100644 --- a/src/fonts/glyph.rs +++ b/src/fonts/glyph.rs @@ -30,9 +30,10 @@ fn test_font_glyph_memory_layout() { mem::align_of::() ); use memoffset::offset_of; + use sys::ImFontGlyph; macro_rules! assert_field_offset { ($l:ident, $r:ident) => { - assert_eq!(offset_of!(FontGlyph, $l), offset_of!(sys::ImFontGlyph, $r)); + assert_eq!(offset_of!(FontGlyph, $l), offset_of!(ImFontGlyph, $r)); }; }; assert_field_offset!(codepoint, Codepoint); diff --git a/src/internal.rs b/src/internal.rs index 4926f058a..ca7e95fa9 100644 --- a/src/internal.rs +++ b/src/internal.rs @@ -25,11 +25,13 @@ fn test_imvector_memory_layout() { mem::align_of::() ); use memoffset::offset_of; + use sys::ImVector_char; + type VectorChar = ImVector; macro_rules! assert_field_offset { ($l:ident, $r:ident) => { assert_eq!( - offset_of!(ImVector, $l), - offset_of!(sys::ImVector_char, $r) + offset_of!(VectorChar, $l), + offset_of!(ImVector_char, $r) ); }; }; diff --git a/src/io.rs b/src/io.rs index fe0132414..91bfd81a7 100644 --- a/src/io.rs +++ b/src/io.rs @@ -380,9 +380,10 @@ fn test_io_memory_layout() { assert_eq!(mem::size_of::(), mem::size_of::()); assert_eq!(mem::align_of::(), mem::align_of::()); use memoffset::offset_of; + use sys::ImGuiIO; macro_rules! assert_field_offset { ($l:ident, $r:ident) => { - assert_eq!(offset_of!(Io, $l), offset_of!(sys::ImGuiIO, $r)); + assert_eq!(offset_of!(Io, $l), offset_of!(ImGuiIO, $r)); }; }; assert_field_offset!(config_flags, ConfigFlags); diff --git a/src/render/draw_data.rs b/src/render/draw_data.rs index 413ac18f3..f124d9a43 100644 --- a/src/render/draw_data.rs +++ b/src/render/draw_data.rs @@ -91,9 +91,10 @@ fn test_drawdata_memory_layout() { mem::align_of::() ); use memoffset::offset_of; + use sys::ImDrawData; macro_rules! assert_field_offset { ($l:ident, $r:ident) => { - assert_eq!(offset_of!(DrawData, $l), offset_of!(sys::ImDrawData, $r)); + assert_eq!(offset_of!(DrawData, $l), offset_of!(ImDrawData, $r)); }; }; assert_field_offset!(valid, Valid); @@ -276,9 +277,10 @@ fn test_drawvert_memory_layout() { mem::align_of::() ); use memoffset::offset_of; + use sys::ImDrawVert; macro_rules! assert_field_offset { ($l:ident, $r:ident) => { - assert_eq!(offset_of!(DrawVert, $l), offset_of!(sys::ImDrawVert, $r)); + assert_eq!(offset_of!(DrawVert, $l), offset_of!(ImDrawVert, $r)); }; }; assert_field_offset!(pos, pos); diff --git a/src/style.rs b/src/style.rs index f9fbc12ac..016c03595 100644 --- a/src/style.rs +++ b/src/style.rs @@ -404,9 +404,10 @@ fn test_style_memory_layout() { assert_eq!(mem::size_of::