aboutsummaryrefslogtreecommitdiffstats
path: root/src/components/main/layout/layout_task.rs
diff options
context:
space:
mode:
authorJack Moffitt <jack@metajack.im>2014-06-01 00:21:53 -0600
committerJack Moffitt <jack@metajack.im>2014-06-05 09:58:59 -0600
commit629c4c6afe7cea86c051bb9f52adeac716e2c43f (patch)
treeee84d9a9b37ecd37e0a9606509624e7f728f5a81 /src/components/main/layout/layout_task.rs
parent2ae671b5aa9d27812adcdb8ebc749733156df66e (diff)
downloadservo-629c4c6afe7cea86c051bb9f52adeac716e2c43f.tar.gz
servo-629c4c6afe7cea86c051bb9f52adeac716e2c43f.zip
Upgrade Rust.
Diffstat (limited to 'src/components/main/layout/layout_task.rs')
-rw-r--r--src/components/main/layout/layout_task.rs10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/components/main/layout/layout_task.rs b/src/components/main/layout/layout_task.rs
index 6cede7b1d9c..fe9ebc2aa65 100644
--- a/src/components/main/layout/layout_task.rs
+++ b/src/components/main/layout/layout_task.rs
@@ -54,8 +54,6 @@ use servo_util::time::{ProfilerChan, profile};
use servo_util::time;
use servo_util::task::send_on_failure;
use servo_util::workqueue::WorkQueue;
-use std::cast::transmute;
-use std::cast;
use std::comm::{channel, Sender, Receiver};
use std::mem;
use std::ptr;
@@ -318,8 +316,8 @@ impl LayoutTask {
let local_image_cache = box LocalImageCache(image_cache_task.clone());
let local_image_cache = unsafe {
let cache = Arc::new(Mutex::new(
- cast::transmute::<Box<LocalImageCache>, *()>(local_image_cache)));
- LocalImageCacheHandle::new(cast::transmute::<Arc<Mutex<*()>>,Arc<*()>>(cache))
+ mem::transmute::<Box<LocalImageCache>, *()>(local_image_cache)));
+ LocalImageCacheHandle::new(mem::transmute::<Arc<Mutex<*()>>,Arc<*()>>(cache))
};
let screen_size = Size2D(Au(0), Au(0));
let parallel_traversal = if opts.layout_threads != 1 {
@@ -562,7 +560,7 @@ impl LayoutTask {
// FIXME: Isolate this transmutation into a "bridge" module.
let node: &mut LayoutNode = unsafe {
let mut node: JS<Node> = JS::from_trusted_node_address(data.document_root);
- transmute(&mut node)
+ mem::transmute(&mut node)
};
debug!("layout: received layout request for: {:s}", data.url.to_str());
@@ -914,7 +912,7 @@ impl LayoutTask {
/// because it contains local managed pointers.
unsafe fn handle_reap_layout_data(&self, layout_data: LayoutDataRef) {
let mut layout_data_ref = layout_data.borrow_mut();
- let _: Option<LayoutDataWrapper> = cast::transmute(
+ let _: Option<LayoutDataWrapper> = mem::transmute(
mem::replace(&mut *layout_data_ref, None));
}
}