Skip to content

Commit

Permalink
geckolib: remove std::mem::transmute usages
Browse files Browse the repository at this point in the history
We can make these look nicer with the FFIArcHelpers trait.
  • Loading branch information
froydnj committed Feb 23, 2017
1 parent 469ed93 commit b1f8f03
Showing 1 changed file with 7 additions and 12 deletions.
19 changes: 7 additions & 12 deletions ports/geckolib/glue.rs
Expand Up @@ -14,7 +14,6 @@ use servo_url::ServoUrl;
use std::borrow::Cow;
use std::env;
use std::fmt::Write;
use std::mem;
use std::ptr;
use std::sync::{Arc, Mutex};
use style::arc_ptr_eq;
Expand Down Expand Up @@ -362,12 +361,10 @@ pub extern "C" fn Servo_StyleSheet_Empty(mode: SheetParsingMode) -> RawServoStyl
SheetParsingMode::eUserSheetFeatures => Origin::User,
SheetParsingMode::eAgentSheetFeatures => Origin::UserAgent,
};
let sheet = Arc::new(Stylesheet::from_str(
Arc::new(Stylesheet::from_str(
"", url, origin, Default::default(), None,
Box::new(StdoutErrorReporter), extra_data));
unsafe {
mem::transmute(sheet)
}
Box::new(StdoutErrorReporter), extra_data)
).into_strong()
}

#[no_mangle]
Expand Down Expand Up @@ -407,12 +404,10 @@ pub extern "C" fn Servo_StyleSheet_FromUTF8Bytes(loader: *mut Loader,
Some(ref s) => Some(s),
};

let sheet = Arc::new(Stylesheet::from_str(
Arc::new(Stylesheet::from_str(
input, url, origin, Default::default(), loader,
Box::new(StdoutErrorReporter), extra_data));
unsafe {
mem::transmute(sheet)
}
Box::new(StdoutErrorReporter), extra_data)
).into_strong()
}

#[no_mangle]
Expand Down Expand Up @@ -1331,7 +1326,7 @@ pub extern "C" fn Servo_ImportRule_GetSheet(import_rule:
RawServoImportRuleBorrowed)
-> RawServoStyleSheetStrong {
let import_rule = RwLock::<ImportRule>::as_arc(&import_rule);
unsafe { mem::transmute(import_rule.read().stylesheet.clone()) }
import_rule.read().stylesheet.clone().into_strong()
}

#[no_mangle]
Expand Down

0 comments on commit b1f8f03

Please sign in to comment.