From 2355828d41d6bb45d283d0b371a5ef1f542e6012 Mon Sep 17 00:00:00 2001
From: Emil Ernerfeldt <emil.ernerfeldt@gmail.com>
Date: Fri, 15 Apr 2022 15:18:04 +0200
Subject: [PATCH] Remove epaint::mutex::Arc type alias

---
 egui/src/context.rs                   |  1 +
 egui/src/data/input.rs                |  2 +-
 egui/src/grid.rs                      |  2 +-
 egui/src/memory.rs                    |  2 +-
 egui/src/menu.rs                      |  3 ++-
 egui/src/painter.rs                   |  3 ++-
 egui/src/style.rs                     |  4 ++--
 egui/src/ui.rs                        |  4 +++-
 egui/src/util/id_type_map.rs          |  2 +-
 egui/src/widget_text.rs               |  2 +-
 egui/src/widgets/text_edit/builder.rs |  2 +-
 epaint/src/mutex.rs                   | 12 ------------
 epaint/src/shape.rs                   | 18 ++++++++----------
 epaint/src/text/font.rs               |  3 ++-
 epaint/src/text/fonts.rs              |  3 ++-
 epaint/src/text/text_layout.rs        |  3 ++-
 epaint/src/text/text_layout_types.rs  |  3 ++-
 epaint/src/texture_handle.rs          |  8 +++-----
 18 files changed, 35 insertions(+), 42 deletions(-)

diff --git a/egui/src/context.rs b/egui/src/context.rs
index 0c55b7131..aaf282638 100644
--- a/egui/src/context.rs
+++ b/egui/src/context.rs
@@ -1,4 +1,5 @@
 // #![warn(missing_docs)]
+use std::sync::Arc;
 
 use crate::{
     animation_manager::AnimationManager, data::output::PlatformOutput, frame_state::FrameState,
diff --git a/egui/src/data/input.rs b/egui/src/data/input.rs
index e71946381..6b918a570 100644
--- a/egui/src/data/input.rs
+++ b/egui/src/data/input.rs
@@ -146,7 +146,7 @@ pub struct DroppedFile {
     /// Set by the `egui_web` backend.
     pub last_modified: Option<std::time::SystemTime>,
     /// Set by the `egui_web` backend.
-    pub bytes: Option<epaint::mutex::Arc<[u8]>>,
+    pub bytes: Option<std::sync::Arc<[u8]>>,
 }
 
 /// An input event generated by the integration.
diff --git a/egui/src/grid.rs b/egui/src/grid.rs
index 780164803..c903c157a 100644
--- a/egui/src/grid.rs
+++ b/egui/src/grid.rs
@@ -46,7 +46,7 @@ impl State {
 
 pub(crate) struct GridLayout {
     ctx: Context,
-    style: epaint::mutex::Arc<Style>,
+    style: std::sync::Arc<Style>,
     id: Id,
 
     /// State previous frame (if any).
diff --git a/egui/src/memory.rs b/egui/src/memory.rs
index ed91043f7..497b97074 100644
--- a/egui/src/memory.rs
+++ b/egui/src/memory.rs
@@ -99,7 +99,7 @@ pub struct Memory {
 pub struct Options {
     /// The default style for new [`Ui`](crate::Ui):s.
     #[cfg_attr(feature = "serde", serde(skip))]
-    pub(crate) style: epaint::mutex::Arc<Style>,
+    pub(crate) style: std::sync::Arc<Style>,
 
     /// Controls the tessellator.
     pub tessellation_options: epaint::TessellationOptions,
diff --git a/egui/src/menu.rs b/egui/src/menu.rs
index 948d3fc30..081af75f0 100644
--- a/egui/src/menu.rs
+++ b/egui/src/menu.rs
@@ -20,7 +20,8 @@ use super::{
     Sense, TextStyle, Ui, Vec2,
 };
 use crate::{widgets::*, *};
-use epaint::{mutex::Arc, mutex::RwLock, Stroke};
+use epaint::{mutex::RwLock, Stroke};
+use std::sync::Arc;
 
 /// What is saved between frames.
 #[derive(Clone, Default)]
diff --git a/egui/src/painter.rs b/egui/src/painter.rs
index f4ded9e50..6534c30d7 100644
--- a/egui/src/painter.rs
+++ b/egui/src/painter.rs
@@ -1,4 +1,5 @@
 use std::ops::RangeInclusive;
+use std::sync::Arc;
 
 use crate::{
     emath::{pos2, Align2, Pos2, Rect, Vec2},
@@ -6,7 +7,7 @@ use crate::{
     Color32, Context, FontId,
 };
 use epaint::{
-    mutex::{Arc, RwLockReadGuard, RwLockWriteGuard},
+    mutex::{RwLockReadGuard, RwLockWriteGuard},
     text::{Fonts, Galley},
     CircleShape, RectShape, Rounding, Shape, Stroke,
 };
diff --git a/egui/src/style.rs b/egui/src/style.rs
index 1d0c40e81..f196fd320 100644
--- a/egui/src/style.rs
+++ b/egui/src/style.rs
@@ -3,7 +3,7 @@
 #![allow(clippy::if_same_then_else)]
 
 use crate::{color::*, emath::*, FontFamily, FontId, Response, RichText, WidgetText};
-use epaint::{mutex::Arc, Rounding, Shadow, Stroke};
+use epaint::{Rounding, Shadow, Stroke};
 use std::collections::BTreeMap;
 
 // ----------------------------------------------------------------------------
@@ -35,7 +35,7 @@ pub enum TextStyle {
     /// ```
     /// egui::TextStyle::Name("footing".into());
     /// ````
-    Name(Arc<str>),
+    Name(std::sync::Arc<str>),
 }
 
 impl std::fmt::Display for TextStyle {
diff --git a/egui/src/ui.rs b/egui/src/ui.rs
index 4be8140f2..04660c789 100644
--- a/egui/src/ui.rs
+++ b/egui/src/ui.rs
@@ -1,7 +1,9 @@
 // #![warn(missing_docs)]
 
-use epaint::mutex::{Arc, RwLock, RwLockReadGuard, RwLockWriteGuard};
 use std::hash::Hash;
+use std::sync::Arc;
+
+use epaint::mutex::{RwLock, RwLockReadGuard, RwLockWriteGuard};
 
 use crate::{
     color::*, containers::*, epaint::text::Fonts, layout::*, menu::MenuState, placer::Placer,
diff --git a/egui/src/util/id_type_map.rs b/egui/src/util/id_type_map.rs
index 82ddf931b..ca2d787ba 100644
--- a/egui/src/util/id_type_map.rs
+++ b/egui/src/util/id_type_map.rs
@@ -3,8 +3,8 @@
 // For non-serializable types, these simply return `None`.
 // This will also allow users to pick their own serialization format per type.
 
-use epaint::mutex::Arc;
 use std::any::Any;
+use std::sync::Arc;
 
 // -----------------------------------------------------------------------------------------------
 
diff --git a/egui/src/widget_text.rs b/egui/src/widget_text.rs
index 497fb3e71..f7d11b0d7 100644
--- a/egui/src/widget_text.rs
+++ b/egui/src/widget_text.rs
@@ -1,4 +1,4 @@
-use epaint::mutex::Arc;
+use std::sync::Arc;
 
 use crate::{
     style::WidgetVisuals, text::LayoutJob, Align, Color32, FontFamily, FontSelection, Galley, Pos2,
diff --git a/egui/src/widgets/text_edit/builder.rs b/egui/src/widgets/text_edit/builder.rs
index 19a2a3928..f65c2f603 100644
--- a/egui/src/widgets/text_edit/builder.rs
+++ b/egui/src/widgets/text_edit/builder.rs
@@ -1,4 +1,4 @@
-use epaint::mutex::Arc;
+use std::sync::Arc;
 
 use epaint::text::{cursor::*, Galley, LayoutJob};
 
diff --git a/epaint/src/mutex.rs b/epaint/src/mutex.rs
index b3639d199..2e600ed7d 100644
--- a/epaint/src/mutex.rs
+++ b/epaint/src/mutex.rs
@@ -142,11 +142,6 @@ mod rw_lock_impl {
     }
 }
 
-#[cfg(not(target_arch = "wasm32"))]
-mod arc_impl {
-    pub use std::sync::Arc;
-}
-
 // ----------------------------------------------------------------------------
 
 #[cfg(target_arch = "wasm32")]
@@ -211,15 +206,8 @@ mod rw_lock_impl {
     }
 }
 
-#[cfg(target_arch = "wasm32")]
-mod arc_impl {
-    // pub use std::rc::Rc as Arc; // TODO(emilk): optimize single threaded code by using `Rc` instead of `Arc`.
-    pub use std::sync::Arc;
-}
-
 // ----------------------------------------------------------------------------
 
-pub use arc_impl::Arc;
 pub use mutex_impl::{Mutex, MutexGuard};
 pub use rw_lock_impl::{RwLock, RwLockReadGuard, RwLockWriteGuard};
 
diff --git a/epaint/src/shape.rs b/epaint/src/shape.rs
index d58eade16..4b3612bd1 100644
--- a/epaint/src/shape.rs
+++ b/epaint/src/shape.rs
@@ -1,5 +1,7 @@
 //! The different shapes that can be painted.
 
+use std::sync::Arc;
+
 use crate::{
     text::{FontId, Fonts, Galley},
     Color32, Mesh, Stroke, TextureId,
@@ -175,17 +177,13 @@ impl Shape {
     }
 
     #[inline]
-    pub fn galley(pos: Pos2, galley: crate::mutex::Arc<Galley>) -> Self {
+    pub fn galley(pos: Pos2, galley: Arc<Galley>) -> Self {
         TextShape::new(pos, galley).into()
     }
 
     #[inline]
     /// The text color in the [`Galley`] will be replaced with the given color.
-    pub fn galley_with_color(
-        pos: Pos2,
-        galley: crate::mutex::Arc<Galley>,
-        text_color: Color32,
-    ) -> Self {
+    pub fn galley_with_color(pos: Pos2, galley: Arc<Galley>, text_color: Color32) -> Self {
         TextShape {
             override_text_color: Some(text_color),
             ..TextShape::new(pos, galley)
@@ -549,7 +547,7 @@ pub struct TextShape {
     pub pos: Pos2,
 
     /// The layed out text, from [`Fonts::layout_job`].
-    pub galley: crate::mutex::Arc<Galley>,
+    pub galley: Arc<Galley>,
 
     /// Add this underline to the whole text.
     /// You can also set an underline when creating the galley.
@@ -567,7 +565,7 @@ pub struct TextShape {
 
 impl TextShape {
     #[inline]
-    pub fn new(pos: Pos2, galley: crate::mutex::Arc<Galley>) -> Self {
+    pub fn new(pos: Pos2, galley: Arc<Galley>) -> Self {
         Self {
             pos,
             galley,
@@ -734,7 +732,7 @@ pub struct PaintCallback {
     ///
     /// The rendering backend is also responsible for restoring any state,
     /// such as the bound shader program and vertex array.
-    pub callback: std::sync::Arc<dyn Fn(&PaintCallbackInfo, &dyn std::any::Any) + Send + Sync>,
+    pub callback: Arc<dyn Fn(&PaintCallbackInfo, &dyn std::any::Any) + Send + Sync>,
 }
 
 impl PaintCallback {
@@ -758,7 +756,7 @@ impl std::cmp::PartialEq for PaintCallback {
         // can only happen if we do dynamic casts back and forth on the pointers, and we don't do that.
         #[allow(clippy::vtable_address_comparisons)]
         {
-            self.rect.eq(&other.rect) && std::sync::Arc::ptr_eq(&self.callback, &other.callback)
+            self.rect.eq(&other.rect) && Arc::ptr_eq(&self.callback, &other.callback)
         }
     }
 }
diff --git a/epaint/src/text/font.rs b/epaint/src/text/font.rs
index 3d4b26143..ff90be509 100644
--- a/epaint/src/text/font.rs
+++ b/epaint/src/text/font.rs
@@ -1,10 +1,11 @@
 use crate::{
-    mutex::{Arc, Mutex, RwLock},
+    mutex::{Mutex, RwLock},
     TextureAtlas,
 };
 use ahash::AHashMap;
 use emath::{vec2, Vec2};
 use std::collections::BTreeSet;
+use std::sync::Arc;
 
 // ----------------------------------------------------------------------------
 
diff --git a/epaint/src/text/fonts.rs b/epaint/src/text/fonts.rs
index 957453467..d699e1019 100644
--- a/epaint/src/text/fonts.rs
+++ b/epaint/src/text/fonts.rs
@@ -1,7 +1,8 @@
 use std::collections::BTreeMap;
+use std::sync::Arc;
 
 use crate::{
-    mutex::{Arc, Mutex, MutexGuard},
+    mutex::{Mutex, MutexGuard},
     text::{
         font::{Font, FontImpl},
         Galley, LayoutJob,
diff --git a/epaint/src/text/text_layout.rs b/epaint/src/text/text_layout.rs
index eacc09584..4e811d8a8 100644
--- a/epaint/src/text/text_layout.rs
+++ b/epaint/src/text/text_layout.rs
@@ -1,7 +1,8 @@
 use std::ops::RangeInclusive;
+use std::sync::Arc;
 
 use super::{FontsImpl, Galley, Glyph, LayoutJob, LayoutSection, Row, RowVisuals};
-use crate::{mutex::Arc, Color32, Mesh, Stroke, Vertex};
+use crate::{Color32, Mesh, Stroke, Vertex};
 use emath::*;
 
 // ----------------------------------------------------------------------------
diff --git a/epaint/src/text/text_layout_types.rs b/epaint/src/text/text_layout_types.rs
index 9d1246082..3af4069d4 100644
--- a/epaint/src/text/text_layout_types.rs
+++ b/epaint/src/text/text_layout_types.rs
@@ -1,9 +1,10 @@
 #![allow(clippy::derive_hash_xor_eq)] // We need to impl Hash for f32, but we don't implement Eq, which is fine
 
 use std::ops::Range;
+use std::sync::Arc;
 
 use super::{cursor::*, font::UvRect};
-use crate::{mutex::Arc, Color32, FontId, Mesh, Stroke};
+use crate::{Color32, FontId, Mesh, Stroke};
 use emath::*;
 
 /// Describes the task of laying out text.
diff --git a/epaint/src/texture_handle.rs b/epaint/src/texture_handle.rs
index fd10de268..288df3c1c 100644
--- a/epaint/src/texture_handle.rs
+++ b/epaint/src/texture_handle.rs
@@ -1,8 +1,6 @@
-use crate::{
-    emath::NumExt,
-    mutex::{Arc, RwLock},
-    ImageData, ImageDelta, TextureId, TextureManager,
-};
+use std::sync::Arc;
+
+use crate::{emath::NumExt, mutex::RwLock, ImageData, ImageDelta, TextureId, TextureManager};
 
 /// Used to paint images.
 ///