aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/browsercontext.rs
diff options
context:
space:
mode:
authorMs2ger <ms2ger@gmail.com>2015-01-01 21:33:52 +0100
committerMs2ger <ms2ger@gmail.com>2015-01-01 22:19:34 +0100
commit43eecf6e7a49a30cac1256fca0817585d4ab3ac8 (patch)
tree805a76c60f90d2e1052f3873fcbe2bc6145fc207 /components/script/dom/browsercontext.rs
parent111a196e9d300164391d12ab292c1d4c0ef2b44a (diff)
downloadservo-43eecf6e7a49a30cac1256fca0817585d4ab3ac8.tar.gz
servo-43eecf6e7a49a30cac1256fca0817585d4ab3ac8.zip
Stop using ptr.is_not_null() in script.
This method is deprecated in rust master; removing its users in advance will make a future rust upgrade smoother.
Diffstat (limited to 'components/script/dom/browsercontext.rs')
-rw-r--r--components/script/dom/browsercontext.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/components/script/dom/browsercontext.rs b/components/script/dom/browsercontext.rs
index 0bd96b75ec8..ee299c6993b 100644
--- a/components/script/dom/browsercontext.rs
+++ b/components/script/dom/browsercontext.rs
@@ -43,7 +43,7 @@ impl BrowserContext {
}
pub fn window_proxy(&self) -> *mut JSObject {
- assert!(self.window_proxy.is_not_null());
+ assert!(!self.window_proxy.is_null());
self.window_proxy
}
@@ -53,14 +53,14 @@ impl BrowserContext {
let js_info = page.js_info();
let WindowProxyHandler(handler) = js_info.as_ref().unwrap().dom_static.windowproxy_handler;
- assert!(handler.is_not_null());
+ assert!(!handler.is_null());
let parent = win.reflector().get_jsobject();
let cx = js_info.as_ref().unwrap().js_context.ptr;
let wrapper = with_compartment(cx, parent, || unsafe {
WrapperNew(cx, parent, handler)
});
- assert!(wrapper.is_not_null());
+ assert!(!wrapper.is_null());
self.window_proxy = wrapper;
}
}