diff options
| author | bors-servo <release+servo@mozilla.com> | 2014-03-19 12:35:17 -0400 |
|---|---|---|
| committer | bors-servo <release+servo@mozilla.com> | 2014-03-19 12:35:17 -0400 |
| commit | f7aa6e3d9b8bfcc0565624f1094241b3b8658bd8 (patch) | |
| tree | 7e7fbd7976c3da12ff463d6ffbeb1a3a336ae7d3 /src/components/main/layout/parallel.rs | |
| parent | caf1ed94468da3c134cc8e8f4a1b934bb353dc19 (diff) | |
| parent | a6100563a6e43471ae43fb155113bc2026992f78 (diff) | |
| download | servo-f7aa6e3d9b8bfcc0565624f1094241b3b8658bd8.tar.gz servo-f7aa6e3d9b8bfcc0565624f1094241b3b8658bd8.zip | |
auto merge of #1934 : larsbergstrom/servo/rust_20140224_squashed, r=jdm
For review only - don't approve yet (need to squash and land submodule updates first).
critic? @metajack
Diffstat (limited to 'src/components/main/layout/parallel.rs')
| -rw-r--r-- | src/components/main/layout/parallel.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/components/main/layout/parallel.rs b/src/components/main/layout/parallel.rs index f03341ed6e0..d81c14d7a06 100644 --- a/src/components/main/layout/parallel.rs +++ b/src/components/main/layout/parallel.rs @@ -29,7 +29,7 @@ use style::{Stylist, TNode}; #[allow(dead_code)] fn static_assertion(node: UnsafeLayoutNode) { unsafe { - let _: PaddedUnsafeFlow = ::std::unstable::intrinsics::transmute(node); + let _: PaddedUnsafeFlow = ::std::intrinsics::transmute(node); } } @@ -235,7 +235,7 @@ fn recalc_style_for_node(unsafe_layout_node: UnsafeLayoutNode, let layout_context: &mut LayoutContext = cast::transmute(*proxy.user_data()); // Get a real layout node. - let node: LayoutNode = ::std::unstable::intrinsics::transmute(unsafe_layout_node); + let node: LayoutNode = ::std::intrinsics::transmute(unsafe_layout_node); // Initialize layout data. // |