Upgrade dependencies

Cargo.toml

@@ -22,7 +22,7 @@ lazy_static = "1.1"
 parking_lot = "0.8"
 
 [dev-dependencies]
-memoffset = "0.3"
+memoffset = "0.4"
 
 [workspace]
 members = [

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"

src/fonts/atlas.rs

@@ -232,9 +232,10 @@ fn test_font_atlas_memory_layout() {
         mem::align_of::<sys::ImFontAtlas>()
     );
     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);

src/fonts/font.rs

@@ -39,9 +39,10 @@ fn test_font_memory_layout() {
     assert_eq!(mem::size_of::<Font>(), mem::size_of::<sys::ImFont>());
     assert_eq!(mem::align_of::<Font>(), mem::align_of::<sys::ImFont>());
     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);

src/fonts/glyph.rs

@@ -30,9 +30,10 @@ fn test_font_glyph_memory_layout() {
         mem::align_of::<sys::ImFontGlyph>()
     );
     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);

src/internal.rs

@@ -25,11 +25,13 @@ fn test_imvector_memory_layout() {
         mem::align_of::<sys::ImVector_char>()
     );
     use memoffset::offset_of;
+    use sys::ImVector_char;
+    type VectorChar = ImVector<u8>;
     macro_rules! assert_field_offset {
         ($l:ident, $r:ident) => {
             assert_eq!(
-                offset_of!(ImVector<u8>, $l),
-                offset_of!(sys::ImVector_char, $r)
+                offset_of!(VectorChar, $l),
+                offset_of!(ImVector_char, $r)
             );
         };
     };

src/io.rs

@@ -380,9 +380,10 @@ fn test_io_memory_layout() {
     assert_eq!(mem::size_of::<Io>(), mem::size_of::<sys::ImGuiIO>());
     assert_eq!(mem::align_of::<Io>(), mem::align_of::<sys::ImGuiIO>());
     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);

src/render/draw_data.rs

@@ -91,9 +91,10 @@ fn test_drawdata_memory_layout() {
         mem::align_of::<sys::ImDrawData>()
     );
     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::<sys::ImDrawVert>()
     );
     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);

src/style.rs

@@ -404,9 +404,10 @@ fn test_style_memory_layout() {
     assert_eq!(mem::size_of::<Style>(), mem::size_of::<sys::ImGuiStyle>());
     assert_eq!(mem::align_of::<Style>(), mem::align_of::<sys::ImGuiStyle>());
     use memoffset::offset_of;
+    use sys::ImGuiStyle;
     macro_rules! assert_field_offset {
         ($l:ident, $r:ident) => {
-            assert_eq!(offset_of!(Style, $l), offset_of!(sys::ImGuiStyle, $r));
+            assert_eq!(offset_of!(Style, $l), offset_of!(ImGuiStyle, $r));
         };
     };
     assert_field_offset!(alpha, Alpha);