Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 06:00:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

add unwrap to send/recv calls

Browse source
This commit is contained in:
Alexandru Cojocaru 2015-01-29 22:11:03 +01:00 • committed by Ms2ger
parent 3da41c2b16
commit 685fee02a0
30 changed files with 100 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

10
components/script/dom/canvasrenderingcontext2d.rs
View file

@ -42,7 +42,7 @@ impl CanvasRenderingContext2D {
}
pub fn recreate(&self, size: Size2D<i32>) {
self.renderer.send(Recreate(size));
self.renderer.send(Recreate(size)).unwrap();
}
}
@ -63,23 +63,23 @@ impl<'a> CanvasRenderingContext2DMethods for JSRef<'a, CanvasRenderingContext2D>
fn FillRect(self, x: f64, y: f64, width: f64, height: f64) {
let rect = Rect(Point2D(x as f32, y as f32), Size2D(width as f32, height as f32));
self.renderer.send(FillRect(rect));
self.renderer.send(FillRect(rect)).unwrap();
}
fn ClearRect(self, x: f64, y: f64, width: f64, height: f64) {
let rect = Rect(Point2D(x as f32, y as f32), Size2D(width as f32, height as f32));
self.renderer.send(ClearRect(rect));
self.renderer.send(ClearRect(rect)).unwrap();
}
fn StrokeRect(self, x: f64, y: f64, width: f64, height: f64) {
let rect = Rect(Point2D(x as f32, y as f32), Size2D(width as f32, height as f32));
self.renderer.send(StrokeRect(rect));
self.renderer.send(StrokeRect(rect)).unwrap();
}
}
#[unsafe_destructor]
impl Drop for CanvasRenderingContext2D {
fn drop(&mut self) {
self.renderer.send(Close);
self.renderer.send(Close).unwrap();
}
}

2
components/script/dom/dedicatedworkerglobalscope.rs
View file

@ -47,7 +47,7 @@ pub struct SendableWorkerScriptChan {
impl ScriptChan for SendableWorkerScriptChan {
fn send(&self, msg: ScriptMsg) {
self.sender.send((self.worker.clone(), msg));
self.sender.send((self.worker.clone(), msg)).unwrap();
}
fn clone(&self) -> Box<ScriptChan + Send> {

2
components/script/dom/document.rs
View file

@ -223,7 +223,7 @@ impl<'a> DocumentHelpers<'a> for JSRef<'a, Document> {
let window = self.window.root();
let window = window.r();
let LayoutChan(ref layout_chan) = window.page().layout_chan;
layout_chan.send(Msg::SetQuirksMode);
layout_chan.send(Msg::SetQuirksMode).unwrap();
}
NoQuirks | LimitedQuirks => {}
}

2
components/script/dom/htmliframeelement.rs
View file

@ -113,7 +113,7 @@ impl<'a> HTMLIFrameElementHelpers for JSRef<'a, HTMLIFrameElement> {
page.id,
new_subpage_id,
old_subpage_id,
sandboxed));
sandboxed)).unwrap();
}
}

2
components/script/dom/htmllinkelement.rs
View file

@ -133,7 +133,7 @@ impl<'a> PrivateHTMLLinkElementHelpers for JSRef<'a, HTMLLinkElement> {
match UrlParser::new().base_url(&window.page().get_url()).parse(href) {
Ok(url) => {
let LayoutChan(ref layout_chan) = window.page().layout_chan;
layout_chan.send(Msg::LoadStylesheet(url));
layout_chan.send(Msg::LoadStylesheet(url)).unwrap();
}
Err(e) => debug!("Parsing url {} failed: {}", href, e)
}

2
components/script/dom/htmlstyleelement.rs
View file

@ -57,7 +57,7 @@ impl<'a> StyleElementHelpers for JSRef<'a, HTMLStyleElement> {
let data = node.GetTextContent().expect("Element.textContent must be a string");
let sheet = Stylesheet::from_str(data.as_slice(), url, Origin::Author);
let LayoutChan(ref layout_chan) = win.page().layout_chan;
layout_chan.send(Msg::AddStylesheet(sheet));
layout_chan.send(Msg::AddStylesheet(sheet)).unwrap();
}
}

12
components/script/dom/storage.rs
View file

@ -54,21 +54,21 @@ impl<'a> StorageMethods for JSRef<'a, Storage> {
fn Length(self) -> u32 {
let (sender, receiver) = channel();
self.get_storage_task().send(StorageTaskMsg::Length(sender, self.get_url()));
self.get_storage_task().send(StorageTaskMsg::Length(sender, self.get_url())).unwrap();
receiver.recv().unwrap()
}
fn Key(self, index: u32) -> Option<DOMString> {
let (sender, receiver) = channel();
self.get_storage_task().send(StorageTaskMsg::Key(sender, self.get_url(), index));
self.get_storage_task().send(StorageTaskMsg::Key(sender, self.get_url(), index)).unwrap();
receiver.recv().unwrap()
}
fn GetItem(self, name: DOMString) -> Option<DOMString> {
let (sender, receiver) = channel();
self.get_storage_task().send(StorageTaskMsg::GetItem(sender, self.get_url(), name));
self.get_storage_task().send(StorageTaskMsg::GetItem(sender, self.get_url(), name)).unwrap();
receiver.recv().unwrap()
}
@ -81,7 +81,7 @@ impl<'a> StorageMethods for JSRef<'a, Storage> {
fn SetItem(self, name: DOMString, value: DOMString) {
let (sender, receiver) = channel();
self.get_storage_task().send(StorageTaskMsg::SetItem(sender, self.get_url(), name, value));
self.get_storage_task().send(StorageTaskMsg::SetItem(sender, self.get_url(), name, value)).unwrap();
if receiver.recv().unwrap() {
//TODO send notification
}
@ -98,7 +98,7 @@ impl<'a> StorageMethods for JSRef<'a, Storage> {
fn RemoveItem(self, name: DOMString) {
let (sender, receiver) = channel();
self.get_storage_task().send(StorageTaskMsg::RemoveItem(sender, self.get_url(), name));
self.get_storage_task().send(StorageTaskMsg::RemoveItem(sender, self.get_url(), name)).unwrap();
if receiver.recv().unwrap() {
//TODO send notification
}
@ -111,7 +111,7 @@ impl<'a> StorageMethods for JSRef<'a, Storage> {
fn Clear(self) {
let (sender, receiver) = channel();
self.get_storage_task().send(StorageTaskMsg::Clear(sender, self.get_url()));
self.get_storage_task().send(StorageTaskMsg::Clear(sender, self.get_url())).unwrap();
if receiver.recv().unwrap() {
//TODO send notification
}

2
components/script/dom/worker.rs
View file

@ -94,7 +94,7 @@ impl<'a> WorkerMethods for JSRef<'a, Worker> {
fn PostMessage(self, cx: *mut JSContext, message: JSVal) -> ErrorResult {
let data = try!(StructuredCloneData::write(cx, message));
let address = Trusted::new(cx, self, self.global.root().r().script_chan().clone());
self.sender.send((address, ScriptMsg::DOMMessage(data)));
self.sender.send((address, ScriptMsg::DOMMessage(data))).unwrap();
Ok(())
}

4
components/script/dom/xmlhttprequest.rs
View file

@ -260,7 +260,7 @@ impl XMLHttpRequest {
// perhaps should be handled by the resource_loader?
spawn_named("XHR:Cors".to_owned(), move || {
let response = req2.http_fetch();
chan.send(response);
chan.send(response).unwrap();
});
select! (
@ -282,7 +282,7 @@ impl XMLHttpRequest {
}
// Step 10, 13
resource_task.send(Load(load_data));
resource_task.send(Load(load_data)).unwrap();
let progress_port;