aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortomaka <pierre.krieger1708@gmail.com>2014-10-30 10:07:43 +0100
committertomaka <pierre.krieger1708@gmail.com>2014-10-30 10:07:43 +0100
commit118b7d32b4edc7c961f93e1c841d6aca04dee550 (patch)
treea094bd6d07815547e9c2133f5a65c8b7649dbf71
parent367d488ccd194c2dba78c600eff94189e338851d (diff)
parent7de3d55e7138fa0d70d18429b733d0ca5bdc2e5b (diff)
downloadglutin-118b7d32b4edc7c961f93e1c841d6aca04dee550.tar.gz
glutin-118b7d32b4edc7c961f93e1c841d6aca04dee550.zip
Merge pull request #91 from tomaka/fail-to-panic
fail! -> panic!
-rw-r--r--src/win32/monitor.rs2
-rw-r--r--src/x11/window/mod.rs2
-rw-r--r--src/x11/window/monitor.rs4
3 files changed, 4 insertions, 4 deletions
diff --git a/src/win32/monitor.rs b/src/win32/monitor.rs
index a45c8fb..3e6b79a 100644
--- a/src/win32/monitor.rs
+++ b/src/win32/monitor.rs
@@ -101,7 +101,7 @@ pub fn get_primary_monitor() -> MonitorID {
}
}
- fail!("Failed to find the primary monitor")
+ panic!("Failed to find the primary monitor")
}
impl MonitorID {
diff --git a/src/x11/window/mod.rs b/src/x11/window/mod.rs
index 2f00438..26d5497 100644
--- a/src/x11/window/mod.rs
+++ b/src/x11/window/mod.rs
@@ -510,7 +510,7 @@ impl Window {
pub unsafe fn make_current(&self) {
let res = ffi::glx::MakeCurrent(self.display, self.window, self.context);
if res == 0 {
- fail!("glx::MakeCurrent failed");
+ panic!("glx::MakeCurrent failed");
}
}
diff --git a/src/x11/window/monitor.rs b/src/x11/window/monitor.rs
index 013b48b..f62a8ef 100644
--- a/src/x11/window/monitor.rs
+++ b/src/x11/window/monitor.rs
@@ -9,7 +9,7 @@ pub fn get_available_monitors() -> Vec<MonitorID> {
let nb_monitors = unsafe {
let display = ffi::XOpenDisplay(ptr::null());
if display.is_null() {
- fail!("get_available_monitors failed");
+ panic!("get_available_monitors failed");
}
let nb_monitors = ffi::XScreenCount(display);
ffi::XCloseDisplay(display);
@@ -26,7 +26,7 @@ pub fn get_primary_monitor() -> MonitorID {
let primary_monitor = unsafe {
let display = ffi::XOpenDisplay(ptr::null());
if display.is_null() {
- fail!("get_available_monitors failed");
+ panic!("get_available_monitors failed");
}
let primary_monitor = ffi::XDefaultScreen(display);
ffi::XCloseDisplay(display);