Merge remote-tracking branch 'origin/master' into feat/multi-window-support

# Conflicts:
#	Cargo.toml
#	core/src/window/icon.rs
#	core/src/window/id.rs
#	core/src/window/position.rs
#	core/src/window/settings.rs
#	examples/integration/src/main.rs
#	examples/integration_opengl/src/main.rs
#	glutin/src/application.rs
#	native/src/subscription.rs
#	native/src/window.rs
#	runtime/src/window/action.rs
#	src/lib.rs
#	src/window.rs
#	winit/Cargo.toml
#	winit/src/application.rs
#	winit/src/icon.rs
#	winit/src/settings.rs
#	winit/src/window.rs

1 files changed, 0 insertions, 43 deletions

diff --git a/native/src/widget/id.rs b/native/src/widget/id.rs
deleted file mode 100644
index 4b8fedf1..00000000
--- a/native/src/widget/id.rs
+++ /dev/null
@@ -1,43 +0,0 @@
-use std::borrow;
-use std::sync::atomic::{self, AtomicUsize};
-
-static NEXT_ID: AtomicUsize = AtomicUsize::new(0);
-
-/// The identifier of a generic widget.
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Id(Internal);
-
-impl Id {
-    /// Creates a custom [`Id`].
-    pub fn new(id: impl Into<borrow::Cow<'static, str>>) -> Self {
-        Self(Internal::Custom(id.into()))
-    }
-
-    /// Creates a unique [`Id`].
-    ///
-    /// This function produces a different [`Id`] every time it is called.
-    pub fn unique() -> Self {
-        let id = NEXT_ID.fetch_add(1, atomic::Ordering::Relaxed);
-
-        Self(Internal::Unique(id))
-    }
-}
-
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub enum Internal {
-    Unique(usize),
-    Custom(borrow::Cow<'static, str>),
-}
-
-#[cfg(test)]
-mod tests {
-    use super::Id;
-
-    #[test]
-    fn unique_generates_different_ids() {
-        let a = Id::unique();
-        let b = Id::unique();
-
-        assert_ne!(a, b);
-    }
-}