From a640a7c5c34f914d3c8515f9b89ae78919af4913 Mon Sep 17 00:00:00 2001 From: Keegan McAllister Date: Tue, 16 Sep 2014 13:00:18 -0700 Subject: Upgrade to rustc 0.12.0-pre (4d2af3861 2014-09-17 15:51:11 +0000) --- components/script/dom/browsercontext.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'components/script/dom/browsercontext.rs') diff --git a/components/script/dom/browsercontext.rs b/components/script/dom/browsercontext.rs index fee00301d55..435b618c153 100644 --- a/components/script/dom/browsercontext.rs +++ b/components/script/dom/browsercontext.rs @@ -28,7 +28,7 @@ impl BrowserContext { let mut context = BrowserContext { history: vec!(SessionHistoryEntry::new(document)), active_index: 0, - window_proxy: Traceable::new(ptr::mut_null()), + window_proxy: Traceable::new(ptr::null_mut()), }; context.create_window_proxy(); context -- cgit v1.2.3 From dc86e8365495acc87b983a290bb7277a37a5247f Mon Sep 17 00:00:00 2001 From: Keegan McAllister Date: Thu, 18 Sep 2014 16:29:46 -0700 Subject: Eliminate warnings --- components/script/dom/browsercontext.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'components/script/dom/browsercontext.rs') diff --git a/components/script/dom/browsercontext.rs b/components/script/dom/browsercontext.rs index 435b618c153..c9ac5e2f040 100644 --- a/components/script/dom/browsercontext.rs +++ b/components/script/dom/browsercontext.rs @@ -53,11 +53,11 @@ impl BrowserContext { let page = win.deref().page(); let js_info = page.js_info(); - let handler = js_info.get_ref().dom_static.windowproxy_handler; + let handler = js_info.as_ref().unwrap().dom_static.windowproxy_handler; assert!(handler.deref().is_not_null()); let parent = win.deref().reflector().get_jsobject(); - let cx = js_info.get_ref().js_context.deref().deref().ptr; + let cx = js_info.as_ref().unwrap().js_context.deref().deref().ptr; let wrapper = with_compartment(cx, parent, || unsafe { WrapperNew(cx, parent, *handler.deref()) }); -- cgit v1.2.3