Skip to content

Commit 29f03ae

Browse files
committed
Bug 1512271 - Allow link.exe to keep linking the stylo tests after rust-lang/rust#54451. r=simonsapin
UltraBlame original commit: 37f24bab080b559284ec7d9108f112f6a97db45c
1 parent d3a27e4 commit 29f03ae

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

servo/ports/geckolib/tests/build.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ fn main() {
8585
for line in r.lines() {
8686
let s = line
8787
.unwrap()
88+
.replace("#[no_mangle]", "")
8889
.replace("pub extern \"C\" fn", "pub unsafe extern \"C\" fn");
8990
w.write_all(s.as_bytes()).unwrap();
9091
w.write_all(b"\n").unwrap();

servo/ports/geckolib/tests/servo_function_signatures.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,15 @@ mod error_reporter;
1616
#[path = "../../../ports/geckolib/stylesheet_loader.rs"]
1717
mod stylesheet_loader;
1818

19-
#[allow(non_snake_case, unused_unsafe, private_no_mangle_fns)]
19+
#[allow(non_snake_case, unused_unsafe)]
2020
mod glue {
2121

2222

2323

24+
25+
26+
27+
2428
use geckoservo::*;
2529
include!(concat!(env!("OUT_DIR"), "/glue.rs"));
2630
}

0 commit comments

Comments
 (0)