From 4e9a3fa5bd998a82281dfd3b8ac6f7cd164941c3 Mon Sep 17 00:00:00 2001 From: Joonas Javanainen Date: Tue, 14 Feb 2017 19:44:40 +0200 Subject: [PATCH] Upgrade to bitflags 0.8 --- CHANGELOG.markdown | 1 + imgui-sys/Cargo.toml | 2 +- imgui-sys/src/lib.rs | 24 ------------------------ 3 files changed, 2 insertions(+), 25 deletions(-) diff --git a/CHANGELOG.markdown b/CHANGELOG.markdown index bd9a59f..3f22772 100644 --- a/CHANGELOG.markdown +++ b/CHANGELOG.markdown @@ -12,6 +12,7 @@ ### Changed +- Upgrade to bitflags 0.8 - Upgrade to glium 0.16 ### Deprecated diff --git a/imgui-sys/Cargo.toml b/imgui-sys/Cargo.toml index 7dd002c..cd9a0e4 100644 --- a/imgui-sys/Cargo.toml +++ b/imgui-sys/Cargo.toml @@ -12,7 +12,7 @@ build = "build.rs" default = ["glium"] [dependencies] -bitflags = "0.7" +bitflags = "0.8" libc = "0.2" [dependencies.glium] diff --git a/imgui-sys/src/lib.rs b/imgui-sys/src/lib.rs index a17db99..1d325e7 100644 --- a/imgui-sys/src/lib.rs +++ b/imgui-sys/src/lib.rs @@ -191,14 +191,6 @@ impl ImGuiWindowFlags { self - mask } } - #[inline] - pub fn set(&mut self, mask: ImGuiWindowFlags, value: bool) { - if value { - *self |= mask; - } else { - *self -= mask; - } - } } bitflags!( @@ -244,14 +236,6 @@ impl ImGuiInputTextFlags { self - mask } } - #[inline] - pub fn set(&mut self, mask: ImGuiInputTextFlags, value: bool) { - if value { - *self |= mask; - } else { - *self -= mask; - } - } } @@ -291,14 +275,6 @@ impl ImGuiTreeNodeFlags { self - mask } } - #[inline] - pub fn set(&mut self, mask: ImGuiTreeNodeFlags, value: bool) { - if value { - *self |= mask; - } else { - *self -= mask; - } - } } pub type ImGuiTextEditCallback =