Merge pull request #561 from braden/master

Implement Display, Error for ContextError
This commit is contained in:
tomaka 2015-08-05 08:33:36 +02:00
commit dff7612e45

View file

@ -121,7 +121,7 @@ impl CreationError {
match *self { match *self {
CreationError::OsError(ref text) => &text, CreationError::OsError(ref text) => &text,
CreationError::NotSupported => "Some of the requested attributes are not supported", CreationError::NotSupported => "Some of the requested attributes are not supported",
CreationError::RobustnessNotSupported => "Your requested robustness, but it is \ CreationError::RobustnessNotSupported => "You requested robustness, but it is \
not supported.", not supported.",
CreationError::OpenGlVersionNotSupported => "The requested OpenGL version is not \ CreationError::OpenGlVersionNotSupported => "The requested OpenGL version is not \
supported.", supported.",
@ -150,6 +150,28 @@ pub enum ContextError {
ContextLost, ContextLost,
} }
impl ContextError {
fn to_string(&self) -> &str {
use std::error::Error;
match *self {
ContextError::IoError(ref err) => err.description(),
ContextError::ContextLost => "Context lost."
}
}
}
impl std::fmt::Display for ContextError {
fn fmt(&self, formatter: &mut std::fmt::Formatter) -> Result<(), std::fmt::Error> {
formatter.write_str(self.to_string())
}
}
impl std::error::Error for ContextError {
fn description(&self) -> &str {
self.to_string()
}
}
/// All APIs related to OpenGL that you can possibly get while using glutin. /// All APIs related to OpenGL that you can possibly get while using glutin.
#[derive(Debug, Clone, Copy, PartialEq, Eq)] #[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub enum Api { pub enum Api {
@ -539,4 +561,3 @@ mod native_monitor {
Unavailable Unavailable
} }
} }