From cc3a09187d4eeb24019e7272946388a56407a25f Mon Sep 17 00:00:00 2001
From: Oscar Gustafsson <oscar.gustafsson@gmail.com>
Date: Mon, 26 Aug 2024 10:41:16 +0200
Subject: [PATCH] Deprecate `ahash` re-exports (#4979)

<!--
Please read the "Making a PR" section of
[`CONTRIBUTING.md`](https://github.com/emilk/egui/blob/master/CONTRIBUTING.md)
before opening a Pull Request!

* Keep your PR:s small and focused.
* The PR title is what ends up in the changelog, so make it descriptive!
* If applicable, add a screenshot or gif.
* If it is a non-trivial addition, consider adding a demo for it to
`egui_demo_lib`, or a new example.
* Do NOT open PR:s from your `master` branch, as that makes it hard for
maintainers to test and add commits to your PR.
* Remember to run `cargo fmt` and `cargo clippy`.
* Open the PR as a draft until you have self-reviewed it and run
`./scripts/check.sh`.
* When you have addressed a PR comment, mark it as resolved.

Please be patient! I will review your PR, but my time is limited!
-->
* Closes <https://github.com/emilk/egui/issues/3482>
* [x] I have followed the instructions in the PR template

Regarding the statement in #3482,
https://docs.rs/egui/latest/egui/layers/struct.GraphicLayers.html#method.drain
accepts a HashMap, but not sure if that is enough to keep the re-export.
---
 crates/egui/src/lib.rs                       | 1 +
 crates/egui_extras/src/loaders/gif_loader.rs | 2 +-
 crates/epaint/src/lib.rs                     | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/crates/egui/src/lib.rs b/crates/egui/src/lib.rs
index 9dc8dea61..1df03f0ba 100644
--- a/crates/egui/src/lib.rs
+++ b/crates/egui/src/lib.rs
@@ -415,6 +415,7 @@ mod callstack;
 #[cfg(feature = "accesskit")]
 pub use accesskit;
 
+#[deprecated = "Use the ahash crate directly."]
 pub use ahash;
 
 pub use epaint;
diff --git a/crates/egui_extras/src/loaders/gif_loader.rs b/crates/egui_extras/src/loaders/gif_loader.rs
index 4f8a120e8..1c2013515 100644
--- a/crates/egui_extras/src/loaders/gif_loader.rs
+++ b/crates/egui_extras/src/loaders/gif_loader.rs
@@ -1,5 +1,5 @@
+use ahash::HashMap;
 use egui::{
-    ahash::HashMap,
     decode_gif_uri, has_gif_magic_header,
     load::{BytesPoll, ImageLoadResult, ImageLoader, ImagePoll, LoadError, SizeHint},
     mutex::Mutex,
diff --git a/crates/epaint/src/lib.rs b/crates/epaint/src/lib.rs
index a8fba51ea..25c445e15 100644
--- a/crates/epaint/src/lib.rs
+++ b/crates/epaint/src/lib.rs
@@ -67,7 +67,9 @@ pub use tessellator::tessellate_shapes;
 pub use ecolor::{Color32, Hsva, HsvaGamma, Rgba};
 pub use emath::{pos2, vec2, Pos2, Rect, Vec2};
 
+#[deprecated = "Use the ahash crate directly."]
 pub use ahash;
+
 pub use ecolor;
 pub use emath;