chore: Move dpi.rs to winit-core wholesale

Signed-off-by: John Nunley <dev@notgull.net>

Cargo.toml

@@ -7,4 +7,5 @@ members = [
 resolver = "2"
 
 [workspace.dependencies]
+serde = { version = "1", features = ["serde_derive"] }
 winit-core = { path = "./winit-core", default-features = false, features = ["std"] }

winit-core/Cargo.toml

@@ -16,3 +16,7 @@ rust-version = "1.70.0"
 default = ["std"]
 std = ["alloc"]
 alloc = []
+serde = ["dep:serde"]
+
+[dependencies]
+serde = { workspace = true, optional = true }

winit-core/src/lib.rs

@@ -10,4 +10,5 @@
 #[cfg(any(not(feature = "std"), not(feature = "alloc")))]
 compile_error! { "no-std and no-alloc usage are not yet supported" }
 
+pub mod dpi;
 pub mod error;

winit/Cargo.toml

@@ -69,7 +69,7 @@ once_cell = "1.12"
 rwh_04 = { package = "raw-window-handle", version = "0.4", optional = true }
 rwh_05 = { package = "raw-window-handle", version = "0.5.2", features = ["std"], optional = true }
 rwh_06 = { package = "raw-window-handle", version = "0.6", features = ["std"], optional = true }
-serde = { version = "1", optional = true, features = ["serde_derive"] }
+serde = { workspace = true, optional = true }
 smol_str = "0.2.0"
 winit-core.workspace = true
 

winit/src/lib.rs

@@ -164,7 +164,9 @@
 #[cfg(feature = "rwh_06")]
 pub use rwh_06 as raw_window_handle;
 
-pub mod dpi;
+#[doc(inline)]
+pub use winit_core::dpi;
+
 #[macro_use]
 pub mod error;
 mod cursor;