From 29f03ae1d2f8df86d26eb46e405df729a00f00bd Mon Sep 17 00:00:00 2001 From: Marco Castelluccio Date: Thu, 3 Oct 2019 19:22:54 +0000 Subject: [PATCH] Bug 1512271 - Allow link.exe to keep linking the stylo tests after rust-lang/rust#54451. r=simonsapin UltraBlame original commit: 37f24bab080b559284ec7d9108f112f6a97db45c --- servo/ports/geckolib/tests/build.rs | 1 + servo/ports/geckolib/tests/servo_function_signatures.rs | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/servo/ports/geckolib/tests/build.rs b/servo/ports/geckolib/tests/build.rs index d27aef36b960d..8e1fccfb604b0 100644 --- a/servo/ports/geckolib/tests/build.rs +++ b/servo/ports/geckolib/tests/build.rs @@ -85,6 +85,7 @@ fn main() { for line in r.lines() { let s = line .unwrap() + .replace("#[no_mangle]", "") .replace("pub extern \"C\" fn", "pub unsafe extern \"C\" fn"); w.write_all(s.as_bytes()).unwrap(); w.write_all(b"\n").unwrap(); diff --git a/servo/ports/geckolib/tests/servo_function_signatures.rs b/servo/ports/geckolib/tests/servo_function_signatures.rs index da3ecbd43b2b2..1653414396e5b 100644 --- a/servo/ports/geckolib/tests/servo_function_signatures.rs +++ b/servo/ports/geckolib/tests/servo_function_signatures.rs @@ -16,11 +16,15 @@ mod error_reporter; #[path = "../../../ports/geckolib/stylesheet_loader.rs"] mod stylesheet_loader; -#[allow(non_snake_case, unused_unsafe, private_no_mangle_fns)] +#[allow(non_snake_case, unused_unsafe)] mod glue { + + + + use geckoservo::*; include!(concat!(env!("OUT_DIR"), "/glue.rs")); }