winit-core: move error

src/error.rs

@@ -1,150 +0,0 @@
-use std::error::Error;
-use std::fmt::{self, Display};
-
-/// A general error that may occur while running or creating
-/// the event loop.
-#[derive(Debug)]
-#[non_exhaustive]
-pub enum EventLoopError {
-    /// The event loop can't be re-created.
-    RecreationAttempt,
-    /// Application has exit with an error status.
-    ExitFailure(i32),
-    /// Got unspecified OS-specific error during the request.
-    Os(OsError),
-    /// Creating the event loop with the requested configuration is not supported.
-    NotSupported(NotSupportedError),
-}
-
-impl fmt::Display for EventLoopError {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            Self::RecreationAttempt => write!(f, "EventLoop can't be recreated"),
-            Self::Os(err) => err.fmt(f),
-            Self::ExitFailure(status) => write!(f, "Exit Failure: {status}"),
-            Self::NotSupported(err) => err.fmt(f),
-        }
-    }
-}
-
-impl Error for EventLoopError {
-    fn source(&self) -> Option<&(dyn Error + 'static)> {
-        if let Self::Os(err) = self {
-            err.source()
-        } else {
-            None
-        }
-    }
-}
-
-impl From<OsError> for EventLoopError {
-    fn from(value: OsError) -> Self {
-        Self::Os(value)
-    }
-}
-
-impl From<NotSupportedError> for EventLoopError {
-    fn from(value: NotSupportedError) -> Self {
-        Self::NotSupported(value)
-    }
-}
-
-/// A general error that may occur during a request to the windowing system.
-#[derive(Debug)]
-#[non_exhaustive]
-pub enum RequestError {
-    /// The request is not supported.
-    NotSupported(NotSupportedError),
-    /// The request was ignored by the operating system.
-    Ignored,
-    /// Got unspecified OS specific error during the request.
-    Os(OsError),
-}
-
-impl Display for RequestError {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            Self::NotSupported(err) => err.fmt(f),
-            Self::Ignored => write!(f, "The request was ignored"),
-            Self::Os(err) => err.fmt(f),
-        }
-    }
-}
-impl Error for RequestError {
-    fn source(&self) -> Option<&(dyn Error + 'static)> {
-        if let Self::Os(err) = self {
-            err.source()
-        } else {
-            None
-        }
-    }
-}
-
-impl From<NotSupportedError> for RequestError {
-    fn from(value: NotSupportedError) -> Self {
-        Self::NotSupported(value)
-    }
-}
-
-impl From<OsError> for RequestError {
-    fn from(value: OsError) -> Self {
-        Self::Os(value)
-    }
-}
-
-/// The requested operation is not supported.
-#[derive(Debug)]
-pub struct NotSupportedError {
-    /// The reason why a certain operation is not supported.
-    reason: &'static str,
-}
-
-impl NotSupportedError {
-    pub(crate) fn new(reason: &'static str) -> Self {
-        Self { reason }
-    }
-}
-
-impl fmt::Display for NotSupportedError {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "Operation is not supported: {}", self.reason)
-    }
-}
-impl Error for NotSupportedError {}
-
-/// Unclassified error from the OS.
-#[derive(Debug)]
-pub struct OsError {
-    line: u32,
-    file: &'static str,
-    error: Box<dyn Error + Send + Sync + 'static>,
-}
-
-impl OsError {
-    #[allow(dead_code)]
-    pub(crate) fn new(
-        line: u32,
-        file: &'static str,
-        error: impl Into<Box<dyn Error + Send + Sync + 'static>>,
-    ) -> Self {
-        Self { line, file, error: error.into() }
-    }
-}
-
-impl Display for OsError {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.pad(&format!("os error at {}:{}: {}", self.file, self.line, self.error))
-    }
-}
-impl Error for OsError {
-    fn source(&self) -> Option<&(dyn Error + 'static)> {
-        Some(self.error.as_ref())
-    }
-}
-
-#[allow(unused_macros)]
-macro_rules! os_error {
-    ($error:expr) => {{
-        crate::error::OsError::new(line!(), file!(), $error)
-    }};
-}

src/lib.rs

@@ -299,12 +299,12 @@ pub use rwh_06 as raw_window_handle;
 pub mod application;
 #[cfg(any(doc, doctest, test))]
 pub mod changelog;
-#[macro_use]
-pub mod error;
 use winit_core::cursor;
 pub mod event;
 pub mod event_loop;
-pub use winit_core::{icon, keyboard, monitor};
+pub use winit_core::{error, icon, keyboard, monitor};
+#[macro_use]
+mod os_error;
 mod platform_impl;
 use winit_core::as_any as utils;
 pub mod window;

src/os_error.rs

@@ -0,0 +1,6 @@
+#[allow(unused_macros)]
+macro_rules! os_error {
+    ($error:expr) => {{
+        winit_core::error::OsError::new(line!(), file!(), $error)
+    }};
+}