Remove epaint::mutex::Arc type alias

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,

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.

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).

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,

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)]

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,
 };

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 {

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,

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;
 
 // -----------------------------------------------------------------------------------------------
 

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,

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};