mirror of
https://github.com/servo/servo.git
synced 2025-08-06 06:00:15 +01:00
Remove usage of unstable feature "raw"
This commit is contained in:
parent
4727b92754
commit
e13ae77daf
4 changed files with 43 additions and 6 deletions
|
@ -44,7 +44,7 @@ use multicol::MulticolFlow;
|
|||
use parallel::FlowParallelInfo;
|
||||
use serde::ser::{Serialize, SerializeStruct, Serializer};
|
||||
use servo_geometry::{au_rect_to_f32_rect, f32_rect_to_au_rect, max_rect};
|
||||
use std::{fmt, mem, raw};
|
||||
use std::{fmt, mem};
|
||||
use std::iter::Zip;
|
||||
use std::slice::IterMut;
|
||||
use std::sync::Arc;
|
||||
|
@ -453,7 +453,7 @@ pub trait Flow: fmt::Debug + Sync + Send + 'static {
|
|||
#[allow(unsafe_code)]
|
||||
pub fn base<T: ?Sized + Flow>(this: &T) -> &BaseFlow {
|
||||
unsafe {
|
||||
let obj = mem::transmute::<&&T, &raw::TraitObject>(&this);
|
||||
let obj = mem::transmute::<&&T, &::TraitObject>(&this);
|
||||
mem::transmute::<*mut (), &BaseFlow>(obj.data)
|
||||
}
|
||||
}
|
||||
|
@ -467,7 +467,7 @@ pub fn child_iter<'a>(flow: &'a Flow) -> FlowListIterator {
|
|||
#[allow(unsafe_code)]
|
||||
pub fn mut_base<T: ?Sized + Flow>(this: &mut T) -> &mut BaseFlow {
|
||||
unsafe {
|
||||
let obj = mem::transmute::<&&mut T, &raw::TraitObject>(&this);
|
||||
let obj = mem::transmute::<&&mut T, &::TraitObject>(&this);
|
||||
mem::transmute::<*mut (), &mut BaseFlow>(obj.data)
|
||||
}
|
||||
}
|
||||
|
@ -1422,7 +1422,7 @@ impl OpaqueFlow {
|
|||
#[allow(unsafe_code)]
|
||||
pub fn from_flow(flow: &Flow) -> OpaqueFlow {
|
||||
unsafe {
|
||||
let object = mem::transmute::<&Flow, raw::TraitObject>(flow);
|
||||
let object = mem::transmute::<&Flow, ::TraitObject>(flow);
|
||||
OpaqueFlow(object.data as usize)
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue