Skip to content

Commit 9c5e1d0

Browse files
malikoliviermalikolivier
committed
[Cargo.toml] Prepare to publish fork
While preparing for publication, I realized I cannot publish crates with cyclic dev-dependencies. That's an interesting issue, and a work-around is currently used: rust-lang/cargo#4242 Another issue: it seems "imgui-glium-renderer" requires the "glutin" feature of "glium". However it was not enabled. So I enabled it.
1 parent cae6647 commit 9c5e1d0

File tree

16 files changed

+73
-79
lines changed

16 files changed

+73
-79
lines changed

‎Cargo.toml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
[package]
2-
name = "imgui"
3-
version = "0.0.19-pre"
4-
authors = ["Joonas Javanainen <[email protected]>", "imgui-rs contributors"]
2+
name = "aflak_imgui"
3+
version = "0.18.1"
4+
authors = ["Joonas Javanainen <[email protected]>",
5+
"Malik Olivier Boussejra <[email protected]>",
6+
"imgui-rs contributors"]
57
description = "High-level Rust bindings to dear imgui"
6-
homepage = "https://github.com/Gekkio/imgui-rs"
7-
repository = "https://github.com/Gekkio/imgui-rs"
8+
homepage = "https://github.com/malikolivier/imgui-rs"
9+
repository = "https://github.com/malikolivier/imgui-rs"
810
license = "MIT/Apache-2.0"
911
categories = ["gui", "api-bindings"]
1012
readme = "README.markdown"
1113

12-
[badges]
13-
travis-ci = { repository = "Gekkio/imgui-rs" }
14-
1514
[dependencies]
16-
imgui-sys = { version = "0.0.19-pre", path = "imgui-sys" }
15+
aflak_imgui-sys = { version = "0.18.1", path = "imgui-sys" }
1716

17+
# Comment this section when publishing new releases to crates.io!
1818
[dev-dependencies]
1919
glium = { version = "0.22", default-features = true }
20-
imgui-glium-renderer = { path = "imgui-glium-renderer" }
20+
aflak_imgui-glium-renderer = { path = "imgui-glium-renderer", version = "0.18.1" }
2121

2222
[workspace]
2323
members = ["imgui-examples", "imgui-sys", "imgui-gfx-renderer", "imgui-glium-renderer"]

‎imgui-examples/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ gfx = "0.17"
1313
gfx_window_glutin = "0.25"
1414
glium = { version = "0.22", default-features = true }
1515
glutin = "0.17"
16-
imgui = { version = "0.0.19-pre", path = "../" }
16+
aflak_imgui = { version = "0.18.1", path = "../" }
1717
imgui-gfx-renderer = { version = "0.0.19-pre", path = "../imgui-gfx-renderer" }
18-
imgui-glium-renderer = { version = "0.0.19-pre", path = "../imgui-glium-renderer" }
19-
imgui-sys = { version = "0.0.19-pre", path = "../imgui-sys", features = ["gfx", "glium"] }
18+
aflak_imgui-glium-renderer = { version = "0.18.1", path = "../imgui-glium-renderer" }
19+
aflak_imgui-sys = { version = "0.18.1", path = "../imgui-sys", features = ["gfx", "glium"] }

‎imgui-examples/examples/color_button.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
extern crate glium;
22
#[macro_use]
3-
extern crate imgui;
4-
extern crate imgui_glium_renderer;
3+
extern crate aflak_imgui as imgui;
4+
extern crate aflak_imgui_glium_renderer as imgui_glium_renderer;
55

66
use imgui::*;
77

‎imgui-examples/examples/custom_textures.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
extern crate glium;
22
#[macro_use]
3-
extern crate imgui;
4-
extern crate imgui_glium_renderer;
3+
extern crate aflak_imgui as imgui;
4+
extern crate aflak_imgui_glium_renderer as imgui_glium_renderer;
55

66
mod support_custom_textures;
77

‎imgui-examples/examples/hello_gfx.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ extern crate gfx;
22
extern crate gfx_window_glutin;
33
extern crate glutin;
44
#[macro_use]
5-
extern crate imgui;
5+
extern crate aflak_imgui as imgui;
66
extern crate imgui_gfx_renderer;
7-
extern crate imgui_sys;
7+
extern crate aflak_imgui_sys as imgui_sys;
88

99
use imgui::*;
1010

‎imgui-examples/examples/hello_world.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
extern crate glium;
22
#[macro_use]
3-
extern crate imgui;
4-
extern crate imgui_glium_renderer;
3+
extern crate aflak_imgui as imgui;
4+
extern crate aflak_imgui_glium_renderer as imgui_glium_renderer;
55

66
use imgui::*;
77

‎imgui-examples/examples/test_drawing_channels_split.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
extern crate glium;
2-
extern crate imgui;
3-
extern crate imgui_glium_renderer;
2+
extern crate aflak_imgui as imgui;
3+
extern crate aflak_imgui_glium_renderer as imgui_glium_renderer;
44

55
mod support;
66

‎imgui-examples/examples/test_window.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
extern crate glium;
2-
extern crate imgui;
3-
extern crate imgui_glium_renderer;
2+
extern crate aflak_imgui as imgui;
3+
extern crate aflak_imgui_glium_renderer as imgui_glium_renderer;
44

55
mod support;
66

‎imgui-examples/examples/test_window_impl.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
extern crate glium;
22
#[macro_use]
3-
extern crate imgui;
4-
extern crate imgui_glium_renderer;
3+
extern crate aflak_imgui as imgui;
4+
extern crate aflak_imgui_glium_renderer as imgui_glium_renderer;
55

66
use imgui::*;
77

‎imgui-gfx-renderer/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ travis-ci = { repository = "Gekkio/imgui-rs" }
1313

1414
[dependencies]
1515
gfx = "0.17"
16-
imgui = { version = "0.0.19-pre", path = "../" }
17-
imgui-sys = { version = "0.0.19-pre", path = "../imgui-sys", features = ["gfx"] }
16+
aflak_imgui = { version = "0.18.1", path = "../" }
17+
aflak_imgui-sys = { version = "0.18.1", path = "../imgui-sys", features = ["gfx"] }

‎imgui-gfx-renderer/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#[macro_use]
22
extern crate gfx;
3-
extern crate imgui;
3+
extern crate aflak_imgui as imgui;
44

55
mod im_texture;
66
pub use im_texture::Texture;

‎imgui-glium-renderer/Cargo.toml

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
11
[package]
2-
name = "imgui-glium-renderer"
3-
version = "0.0.19-pre"
2+
name = "aflak_imgui-glium-renderer"
3+
version = "0.18.1"
44
authors = ["Joonas Javanainen <[email protected]>", "imgui-rs contributors"]
55
description = "Glium renderer for the imgui crate"
6-
homepage = "https://github.com/Gekkio/imgui-rs"
7-
repository = "https://github.com/Gekkio/imgui-rs"
6+
homepage = "https://github.com/malikolivier/imgui-rs"
7+
repository = "https://github.com/malikolivier/imgui-rs"
88
license = "MIT/Apache-2.0"
99
categories = ["gui", "rendering"]
1010

11-
[badges]
12-
travis-ci = { repository = "Gekkio/imgui-rs" }
13-
1411
[dependencies]
15-
glium = { version = "0.22", default-features = false }
16-
imgui = { version = "0.0.19-pre", path = "../" }
17-
imgui-sys = { version = "0.0.19-pre", path = "../imgui-sys", features = ["glium"] }
12+
glium = { version = "0.22", features = ["glutin"] }
13+
aflak_imgui = { version = "0.18.1", path = "../" }
14+
aflak_imgui-sys = { version = "0.18.1", path = "../imgui-sys", features = ["glium"] }

‎imgui-glium-renderer/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#[macro_use]
22
extern crate glium;
3-
extern crate imgui;
3+
extern crate aflak_imgui as imgui;
44

55
mod context;
66
mod im_texture;

‎imgui-sys/Cargo.toml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
11
[package]
2-
name = "imgui-sys"
3-
version = "0.0.19-pre"
2+
name = "aflak_imgui-sys"
3+
version = "0.18.1"
44
authors = ["Joonas Javanainen <[email protected]>", "imgui-rs contributors"]
55
description = "Raw FFI bindings to dear imgui"
6-
homepage = "https://github.com/Gekkio/imgui-rs"
7-
repository = "https://github.com/Gekkio/imgui-rs"
6+
homepage = "https://github.com/malikolivier/imgui-rs"
7+
repository = "https://github.com/malikolivier/imgui-rs"
88
license = "MIT/Apache-2.0"
99
categories = ["gui", "external-ffi-bindings"]
1010
build = "build.rs"
1111

12-
[badges]
13-
travis-ci = { repository = "Gekkio/imgui-rs" }
14-
1512
[dependencies]
1613
libc = "0.2"
1714
bitflags = "1.0"

‎src/lib.rs

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pub extern crate imgui_sys as sys;
1+
pub extern crate aflak_imgui_sys as sys;
22

33
use std::ffi::CStr;
44
use std::mem;
@@ -360,7 +360,7 @@ impl ImGui {
360360
/// # Example
361361
///
362362
/// ```rust
363-
/// use imgui::{ImGuiKey, Ui};
363+
/// use aflak_imgui::{ImGuiKey, Ui};
364364
///
365365
/// fn test(ui: &Ui) {
366366
/// let delete_key_index = ui.imgui().get_key_index(ImGuiKey::Delete);
@@ -1061,8 +1061,8 @@ impl<'ui> Ui<'ui> {
10611061
/// # Examples
10621062
///
10631063
/// ```
1064-
/// # #[macro_use] extern crate imgui;
1065-
/// # use imgui::*;
1064+
/// # #[macro_use] extern crate aflak_imgui;
1065+
/// # use aflak_imgui::*;
10661066
/// fn user_interface(ui: &Ui) {
10671067
/// ui.text("Hover over me");
10681068
/// if ui.is_item_hovered() {
@@ -1086,8 +1086,8 @@ impl<'ui> Ui<'ui> {
10861086
/// # Examples
10871087
///
10881088
/// ```
1089-
/// # #[macro_use] extern crate imgui;
1090-
/// # use imgui::*;
1089+
/// # #[macro_use] extern crate aflak_imgui;
1090+
/// # use aflak_imgui::*;
10911091
/// fn user_interface(ui: &Ui) {
10921092
/// ui.text("Hover over me");
10931093
/// if ui.is_item_hovered() {
@@ -1197,7 +1197,7 @@ impl<'ui> Ui<'ui> {
11971197
///
11981198
/// # Example
11991199
/// ```rust,no_run
1200-
/// # use imgui::*;
1200+
/// # use aflak_imgui::*;
12011201
/// # let mut imgui = ImGui::init();
12021202
/// # let ui = imgui.frame((0, 0), (0, 0), 0.1);
12031203
/// # let mut selected_radio_value = 2;
@@ -1214,7 +1214,7 @@ impl<'ui> Ui<'ui> {
12141214
///
12151215
/// # Example
12161216
/// ```rust,no_run
1217-
/// # use imgui::*;
1217+
/// # use aflak_imgui::*;
12181218
/// # let mut imgui = ImGui::init();
12191219
/// # let ui = imgui.frame((0, 0), (0, 0), 0.1);
12201220
/// # let mut radio_button_test = "cats".to_string();
@@ -1291,7 +1291,7 @@ impl<'ui> Ui<'ui> {
12911291
///
12921292
/// # Example
12931293
/// ```rust,no_run
1294-
/// # use imgui::*;
1294+
/// # use aflak_imgui::*;
12951295
/// # let mut imgui = ImGui::init();
12961296
/// # let ui = imgui.frame((0, 0), (0, 0), 0.1);
12971297
/// ui.progress_bar(0.6)
@@ -1309,7 +1309,7 @@ impl<'ui> Ui<'ui> {
13091309
///
13101310
/// # Example
13111311
/// ```rust,no_run
1312-
/// # use imgui::*;
1312+
/// # use aflak_imgui::*;
13131313
/// # let mut imgui = ImGui::init();
13141314
/// # let ui = imgui.frame((0, 0), (0, 0), 0.1);
13151315
/// ui.window(im_str!("ChatWindow"))
@@ -1345,12 +1345,12 @@ impl<'ui> Ui<'ui> {
13451345
/// ## Example using glium as back-end
13461346
///
13471347
/// ```rust,no_run
1348-
/// #[macro_use] extern crate imgui;
1348+
/// #[macro_use] extern crate aflak_imgui;
13491349
/// extern crate glium;
1350-
/// extern crate imgui_glium_renderer;
1350+
/// extern crate aflak_imgui_glium_renderer;
13511351
///
1352-
/// use imgui::*;
1353-
/// use imgui_glium_renderer::Texture;
1352+
/// use aflak_imgui::*;
1353+
/// use aflak_imgui_glium_renderer::Texture;
13541354
/// use glium::backend::Facade;
13551355
///
13561356
/// fn make_a_texture<F: Facade>(ui: &Ui, facade: &F, data: Vec<Vec<(u8, u8, u8, u8)>>) {
@@ -1377,7 +1377,7 @@ impl<'ui> Ui<'ui> {
13771377
///
13781378
/// # Example
13791379
/// ```rust,no_run
1380-
/// # use imgui::*;
1380+
/// # use aflak_imgui::*;
13811381
/// # let mut imgui = ImGui::init();
13821382
/// # let ui = imgui.frame((0, 0), (0, 0), 0.1);
13831383
/// ui.with_style_var(StyleVar::Alpha(0.2), || {
@@ -1395,7 +1395,7 @@ impl<'ui> Ui<'ui> {
13951395
///
13961396
/// # Example
13971397
/// ```rust,no_run
1398-
/// # use imgui::*;
1398+
/// # use aflak_imgui::*;
13991399
/// # let mut imgui = ImGui::init();
14001400
/// # let ui = imgui.frame((0, 0), (0, 0), 0.1);
14011401
/// # let styles = [StyleVar::Alpha(0.2), StyleVar::WindowPadding(ImVec2::new(1.0, 1.0))];
@@ -1455,7 +1455,7 @@ impl<'ui> Ui<'ui> {
14551455
///
14561456
/// # Example
14571457
/// ```rust,no_run
1458-
/// # use imgui::*;
1458+
/// # use aflak_imgui::*;
14591459
/// # let mut imgui = ImGui::init();
14601460
/// # let ui = imgui.frame((0, 0), (0, 0), 0.1);
14611461
/// ui.with_color_var(ImGuiCol::Text, (1.0, 0.0, 0.0, 1.0), || {
@@ -1481,7 +1481,7 @@ impl<'ui> Ui<'ui> {
14811481
///
14821482
/// # Example
14831483
/// ```rust,no_run
1484-
/// # use imgui::*;
1484+
/// # use aflak_imgui::*;
14851485
/// # let mut imgui = ImGui::init();
14861486
/// # let ui = imgui.frame((0, 0), (0, 0), 0.1);
14871487
/// let red = (1.0, 0.0, 0.0, 1.0);
@@ -1531,8 +1531,8 @@ impl<'ui> Ui<'ui> {
15311531
/// # Examples
15321532
///
15331533
/// ```
1534-
/// # #[macro_use] extern crate imgui;
1535-
/// # use imgui::*;
1534+
/// # #[macro_use] extern crate aflak_imgui;
1535+
/// # use aflak_imgui::*;
15361536
/// fn user_interface(ui: &Ui) {
15371537
/// ui.text("Hover over me");
15381538
/// let is_hover_over_me_text_hovered = ui.is_item_hovered();
@@ -1573,7 +1573,7 @@ impl<'ui> Ui<'ui> {
15731573
/// # Examples
15741574
///
15751575
/// ```rust,no_run
1576-
/// # use imgui::*;
1576+
/// # use aflak_imgui::*;
15771577
/// fn custom_draw(ui: &Ui) {
15781578
/// let draw_list = ui.get_window_draw_list();
15791579
/// // Draw a line
@@ -1588,7 +1588,7 @@ impl<'ui> Ui<'ui> {
15881588
/// dropped.
15891589
///
15901590
/// ```rust
1591-
/// # use imgui::*;
1591+
/// # use aflak_imgui::*;
15921592
/// fn custom_draw(ui: &Ui) {
15931593
/// let draw_list = ui.get_window_draw_list();
15941594
/// // Draw something...
@@ -1615,12 +1615,12 @@ impl<'ui> Ui<'ui> {
16151615
/// ## Example using glium as back-end
16161616
///
16171617
/// ```rust,no_run
1618-
/// #[macro_use] extern crate imgui;
1618+
/// #[macro_use] extern crate aflak_imgui;
16191619
/// extern crate glium;
1620-
/// extern crate imgui_glium_renderer;
1620+
/// extern crate aflak_imgui_glium_renderer;
16211621
///
1622-
/// use imgui::*;
1623-
/// use imgui_glium_renderer::Texture;
1622+
/// use aflak_imgui::*;
1623+
/// use aflak_imgui_glium_renderer::Texture;
16241624
/// use glium::backend::Facade;
16251625
/// use glium::Texture2d;
16261626
///
@@ -1658,12 +1658,12 @@ impl<'ui> Ui<'ui> {
16581658
/// ## Example using glium as back-end
16591659
///
16601660
/// ```rust,no_run
1661-
/// #[macro_use] extern crate imgui;
1661+
/// #[macro_use] extern crate aflak_imgui;
16621662
/// extern crate glium;
1663-
/// extern crate imgui_glium_renderer;
1663+
/// extern crate aflak_imgui_glium_renderer;
16641664
///
1665-
/// use imgui::*;
1666-
/// use imgui_glium_renderer::Texture;
1665+
/// use aflak_imgui::*;
1666+
/// use aflak_imgui_glium_renderer::Texture;
16671667
/// use glium::backend::Facade;
16681668
///
16691669
/// fn make_a_texture<F: Facade>(ui: &Ui, facade: &F, data: Vec<Vec<(u8, u8, u8, u8)>>) {

‎src/window_draw_list.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ impl<'ui> WindowDrawList<'ui> {
8585
/// # Example
8686
///
8787
/// ```rust,no_run
88-
/// # use imgui::*;
88+
/// # use aflak_imgui::*;
8989
/// fn custom_drawing(ui: &Ui) {
9090
/// let draw_list = ui.get_window_draw_list();
9191
/// draw_list.channels_split(2, |channels| {

0 commit comments

Comments
 (0)