From 468d6c8a338269596788494ee050d4df607009e1 Mon Sep 17 00:00:00 2001
From: Jonathan Spira <jjspira@gmail.com>
Date: Mon, 1 Feb 2021 23:01:59 -0800
Subject: [PATCH] removed my changelog

---
 CHANGELOG.markdown       | 5 -----
 imgui/src/lib.rs         | 2 +-
 imgui/src/stacks.rs      | 4 +---
 imgui/src/widget/tree.rs | 3 +--
 4 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.markdown b/CHANGELOG.markdown
index 9141a74..3e6d013 100644
--- a/CHANGELOG.markdown
+++ b/CHANGELOG.markdown
@@ -51,11 +51,6 @@
 - The variants of `ColorEditInputMode` and `ColorEditDisplayMode` have been renamed to be CamelCase instead of upper case (e.g. `ColorEditFooMode::RGB` => `ColorEditFooMode::Rgb`).
     - However, this change is probably not breaking (in practice if not in theory) because const aliases using the old names are provided.
 
-- Most tokens through the repository (eg. `WindowToken`, `TabBarToken`, `FontStackToken`, etc) now allow for permissive dropping -- i.e, you don't need to actually call the `.end()` method on them anymore. In exchange, these tokens have taken on a lifetime, which allows them to be safe.
-- `end()` no longer takes `Ui`. This is a breaking change, but hopefully should be trivial (and perhaps nice) for users to fix. Simply delete the parameters, or add a `_` before the token's binding name and allow it to be dropped on its own.
-
-- `PopupModal`'s `new` was reworked so that it didn't take `Ui` until `build` was called. This is a breaking change if you were invoking it directly. Simply move your `ui` call to `build` or `begin`.
-
 ## [0.6.1] - 2020-12-16
 
 - Support for winit 0.24.x
diff --git a/imgui/src/lib.rs b/imgui/src/lib.rs
index cd5dd36..b104421 100644
--- a/imgui/src/lib.rs
+++ b/imgui/src/lib.rs
@@ -29,7 +29,7 @@ pub use self::legacy::*;
 pub use self::list_clipper::ListClipper;
 pub use self::plothistogram::PlotHistogram;
 pub use self::plotlines::PlotLines;
-pub use self::popups::PopupModal;
+pub use self::popups::*;
 pub use self::render::draw_data::*;
 pub use self::render::renderer::*;
 pub use self::stacks::*;
diff --git a/imgui/src/stacks.rs b/imgui/src/stacks.rs
index 1e4fe21..39381bd 100644
--- a/imgui/src/stacks.rs
+++ b/imgui/src/stacks.rs
@@ -347,7 +347,6 @@ pub enum ItemFlag {
     ButtonRepeat(bool),
 }
 
-/// Tracks a change pushed to the item width stack
 pub struct ItemWidthStackToken {
     _ctx: *const Context,
 }
@@ -407,7 +406,6 @@ create_token!(
 
 impl IdStackToken<'_> {
     /// Pops a change from the ID stack
-    #[deprecated = "deprecated in 0.7.0. Use `end` instead."]
     pub fn pop(self) {
         self.end()
     }
@@ -419,7 +417,7 @@ impl<'ui> Ui<'ui> {
     ///
     /// Returns an `IdStackToken` that can be popped by calling `.end()`
     /// or by dropping manually.
-    pub fn push_id<'a, I: Into<Id<'a>>>(&self, id: I) -> IdStackToken<'_> {
+    pub fn push_id<'a, I: Into<Id<'a>>>(&self, id: I) -> IdStackToken<'ui> {
         let id = id.into();
 
         unsafe {
diff --git a/imgui/src/widget/tree.rs b/imgui/src/widget/tree.rs
index 9babd7e..0a9b8c3 100644
--- a/imgui/src/widget/tree.rs
+++ b/imgui/src/widget/tree.rs
@@ -231,10 +231,9 @@ impl<'a> TreeNode<'a> {
     /// Pushes a tree node and starts appending to it.
     ///
     /// Returns `Some(TreeNodeToken)` if the tree node is open. After content has been
-    /// rendered, the token must be popped by calling `.pop()`.
+    /// rendered, the token can be popped by calling `.pop()`.
     ///
     /// Returns `None` if the tree node is not open and no content should be rendered.
-    #[must_use]
     pub fn push<'ui>(self, ui: &Ui<'ui>) -> Option<TreeNodeToken<'ui>> {
         let open = unsafe {
             if self.opened_cond != Condition::Never {