Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump versions to 0.8.3 (and fix some clippy complaints) #645

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
[![Build Status](https://github.com/imgui-rs/imgui-rs/workflows/ci/badge.svg)](https://github.com/imgui-rs/imgui-rs/actions)
[![Latest release on crates.io](https://img.shields.io/crates/v/imgui.svg)](https://crates.io/crates/imgui)
[![Documentation on docs.rs](https://docs.rs/imgui/badge.svg)](https://docs.rs/imgui)
[![Wrapped Dear ImGui Version](https://img.shields.io/badge/Dear%20ImGui%20Version-1.84.2-blue.svg)](https://github.com/ocornut/imgui)
[![Wrapped Dear ImGui Version](https://img.shields.io/badge/Dear%20ImGui%20Version-1.86-blue.svg)](https://github.com/ocornut/imgui)

(Recently under new maintenance, things subject to change)

Expand Down Expand Up @@ -123,7 +123,7 @@ cargo run --example glow_01_basic
Note to Windows users: You will need to use the _MSVC ABI_ version of the Rust
compiler along with its associated
[dependencies](https://www.rust-lang.org/en-US/downloads.html#win-foot) to
build this libary and run the examples.
build this library and run the examples.

## How to contribute

Expand Down
2 changes: 1 addition & 1 deletion imgui-examples/examples/radio_button.rs
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ struct State {
choice: Option<Choice>,
}

#[derive(Copy, Clone, PartialEq)]
#[derive(Copy, Clone, PartialEq, Eq)]
enum Choice {
A,
B,
Expand Down
2 changes: 1 addition & 1 deletion imgui-examples/examples/tables_api.rs
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ struct HumanData {
}

impl HumanData {
pub fn sort_humans(humans: &mut Vec<Self>, specs: Specs<'_>) {
pub fn sort_humans(humans: &mut [Self], specs: Specs<'_>) {
let spec = specs.iter().next().unwrap();
if let Some(kind) = spec.sort_direction() {
match kind {
Expand Down
4 changes: 2 additions & 2 deletions imgui-glium-renderer/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "imgui-glium-renderer"
version = "0.8.1-alpha.0"
version = "0.8.3"
edition = "2018"
authors = ["The imgui-rs Developers"]
description = "Glium renderer for the imgui crate"
Expand All @@ -11,4 +11,4 @@ categories = ["gui", "rendering"]

[dependencies]
glium = { version = "0.31", default-features = false }
imgui = { version = "0.8.1-alpha.0", path = "../imgui" }
imgui = { version = "0.8.3", path = "../imgui" }
6 changes: 3 additions & 3 deletions imgui-glow-renderer/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "imgui-glow-renderer"
version = "0.8.1-alpha.0"
version = "0.8.3"
edition = "2018"
authors = ["jmaargh and the imgui-rs Developers"]
description = "glow renderer for the imgui crate"
Expand All @@ -10,13 +10,13 @@ license = "MIT/Apache-2.0"
categories = ["gui", "rendering"]

[dependencies]
imgui = { version = "0.8.1-alpha.0", path = "../imgui" }
imgui = { version = "0.8.3", path = "../imgui" }
glow = "0.10.0"
memoffset = "0.6.4"

[dev-dependencies]
glutin = "0.28.0"
imgui-winit-support = { version = "0.8.1-alpha.0", path = "../imgui-winit-support" }
imgui-winit-support = { version = "0.8.3", path = "../imgui-winit-support" }
image = "0.23"

[features]
Expand Down
2 changes: 1 addition & 1 deletion imgui-glow-renderer/src/versions.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#![allow(clippy::must_use_candidate)]

#[derive(PartialEq, Clone, Copy)]
#[derive(PartialEq, Eq, Clone, Copy)]
pub struct GlVersion {
pub major: u16,
pub minor: u16,
Expand Down
6 changes: 3 additions & 3 deletions imgui-sdl2-support/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "imgui-sdl2-support"
version = "0.8.1-alpha.0"
version = "0.8.3"
edition = "2018"
authors = ["The imgui-rs Developers"]
description = "sdl2 support code for the imgui crate"
Expand All @@ -10,10 +10,10 @@ license = "MIT/Apache-2.0"
categories = ["gui"]

[dependencies]
imgui = { version = "0.8.1-alpha.0", path = "../imgui" }
imgui = { version = "0.8.3", path = "../imgui" }
sdl2 = "0.34.5"

[dev-dependencies]
glow = "0.10.0"
imgui-glow-renderer = { version = "0.8.1-alpha.0", path = "../imgui-glow-renderer" }
imgui-glow-renderer = { version = "0.8.3", path = "../imgui-glow-renderer" }
sdl2 = { version = "0.34.5", features = ["bundled", "static-link"] }
2 changes: 1 addition & 1 deletion imgui-sys/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "imgui-sys"
version = "0.8.1-alpha.0"
version = "0.8.3"
edition = "2018"
authors = ["The imgui-rs Developers"]
description = "Raw FFI bindings to dear imgui"
Expand Down
4 changes: 2 additions & 2 deletions imgui-winit-support/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "imgui-winit-support"
version = "0.8.1-alpha.0"
version = "0.8.3"
edition = "2018"
authors = ["The imgui-rs Developers"]
description = "winit support code for the imgui crate"
Expand All @@ -10,5 +10,5 @@ license = "MIT/Apache-2.0"
categories = ["gui"]

[dependencies]
imgui = { version = "0.8.1-alpha.0", path = "../imgui" }
imgui = { version = "0.8.3", path = "../imgui" }
winit = { version = "0.26.0", default-features = false }
2 changes: 1 addition & 1 deletion imgui-winit-support/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ impl CursorSettings {
}
}

#[derive(Copy, Clone, Debug, PartialEq)]
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
enum ActiveHiDpiMode {
Default,
Rounded,
Expand Down
4 changes: 2 additions & 2 deletions imgui/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "imgui"
version = "0.8.1-alpha.0"
version = "0.8.3"
edition = "2018"
authors = ["The imgui-rs Developers"]
description = "High-level Rust bindings to dear imgui"
Expand All @@ -17,7 +17,7 @@ features = ["freetype", "docking", "tables-api"]

[dependencies]
bitflags = "1"
imgui-sys = { version = "0.8.1-alpha.0", path = "../imgui-sys" }
imgui-sys = { version = "0.8.3", path = "../imgui-sys" }
mint = "0.5.6"
parking_lot = "0.12"
cfg-if = "1"
Expand Down
4 changes: 2 additions & 2 deletions imgui/src/stacks.rs
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ impl Ui {
}

/// A temporary change in item flags
#[derive(Copy, Clone, Debug, PartialEq)]
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
pub enum ItemFlag {
AllowKeyboardFocus(bool),
ButtonRepeat(bool),
Expand Down Expand Up @@ -371,7 +371,7 @@ impl IdStackToken<'_> {
}

/// # ID stack
impl<'ui> Ui {
impl Ui {
/// Pushes an identifier to the ID stack.
///
/// Returns an `IdStackToken` that can be popped by calling `.end()`
Expand Down
2 changes: 1 addition & 1 deletion imgui/src/string.rs
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ impl ImString {
}
}

impl<'a> Default for ImString {
impl Default for ImString {
#[inline]
fn default() -> ImString {
ImString(vec![b'\0'])
Expand Down
2 changes: 1 addition & 1 deletion imgui/src/tables.rs
Original file line number Diff line number Diff line change
Expand Up @@ -760,7 +760,7 @@ pub struct TableColumnSetup<Name> {
pub user_id: Id,
}

impl<'a, Name: AsRef<str>> TableColumnSetup<Name> {
impl<Name: AsRef<str>> TableColumnSetup<Name> {
pub fn new(name: Name) -> Self {
Self {
name,
Expand Down
4 changes: 2 additions & 2 deletions imgui/src/tokens.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ macro_rules! create_token {
) => {
#[must_use]
$(#[$struct_meta])*
pub struct $token_name<'a>($crate::__core::marker::PhantomData<&'a crate::Ui>);
pub struct $token_name<'a>($crate::__core::marker::PhantomData<&'a $crate::Ui>);

impl<'a> $token_name<'a> {
/// Creates a new token type.
pub(crate) fn new(_: &'a crate::Ui) -> Self {
pub(crate) fn new(_: &'a $crate::Ui) -> Self {
Self(std::marker::PhantomData)
}

Expand Down
2 changes: 1 addition & 1 deletion imgui/src/window/scroll.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use crate::sys;
use crate::Ui;

/// # Window scrolling
impl<'ui> Ui {
impl Ui {
/// Returns the horizontal scrolling position.
///
/// Value is between 0.0 and self.scroll_max_x().
Expand Down