Skip to content

Commit

Permalink
Bug 1512271 - Allow link.exe to keep linking the stylo tests after ru…
Browse files Browse the repository at this point in the history
…st-lang/rust#54451. r=simonsapin

UltraBlame original commit: 37f24bab080b559284ec7d9108f112f6a97db45c
  • Loading branch information
marco-c committed Oct 3, 2019
1 parent 8d73541 commit de832a2
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 5 deletions.
12 changes: 12 additions & 0 deletions servo/ports/geckolib/tests/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -803,6 +803,18 @@ unwrap
replace
(
"
#
[
no_mangle
]
"
"
"
)
.
replace
(
"
pub
extern
\
Expand Down
44 changes: 39 additions & 5 deletions servo/ports/geckolib/tests/servo_function_signatures.rs
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,6 @@ allow
(
non_snake_case
unused_unsafe
private_no_mangle_fns
)
]
mod
Expand All @@ -193,13 +192,13 @@ safe
functions
swapped
for
/
/
unsafe
ones
.
This
is
/
/
a
hack
to
Expand All @@ -210,6 +209,8 @@ fact
that
fn
types
/
/
cannot
coerce
to
Expand All @@ -218,13 +219,13 @@ fn
types
.
The
/
/
imports
are
populated
with
the
/
/
same
things
so
Expand All @@ -234,6 +235,39 @@ assertion
should
be
equivalent
.
/
/
/
/
We
also
rely
on
#
[
no_mangle
]
being
stripped
out
so
that
it
can
link
on
/
/
Windows
without
linking
to
Gecko
see
bug
1512271
.
use
geckoservo
:
Expand Down

0 comments on commit de832a2

Please sign in to comment.