Skip to content

Commit 7c79fdb

Browse files
committed
servo: Merge #16975 - style: Bump bindgen version (from emilio:bindgenupagain); r=upsuper
This should fix bug 1365488, and also the template instantiation test noise reported at rust-lang/rust-bindgen#619. Source-Repo: https://github.com/servo/servo Source-Revision: 1602edb04ac3cc06a71eb6349e137dce453bc191 --HG-- extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear extra : subtree_revision : 06b0a5c0055788959826d228b5d1ebd7764d43c9
1 parent 7666f7e commit 7c79fdb

File tree

6 files changed

+11571
-3685
lines changed

6 files changed

+11571
-3685
lines changed

servo/Cargo.lock

+13-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

servo/components/style/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ kernel32-sys = "0.2"
7575
[build-dependencies]
7676
lazy_static = "0.2"
7777
log = "0.3"
78-
bindgen = { version = "0.25", optional = true }
78+
bindgen = { version = "0.25.1", optional = true }
7979
regex = {version = "0.2", optional = true}
8080
walkdir = "1.0"
8181
toml = {version = "0.2.1", optional = true, default-features = false}

servo/components/style/gecko/generated/atom_macro.rs

+8
Original file line numberDiff line numberDiff line change
@@ -2164,6 +2164,8 @@ cfg_if! {
21642164
pub static nsGkAtoms_onreloadpage: *mut nsIAtom;
21652165
#[link_name = "_ZN9nsGkAtoms3remE"]
21662166
pub static nsGkAtoms_rem: *mut nsIAtom;
2167+
#[link_name = "_ZN9nsGkAtoms6remoteE"]
2168+
pub static nsGkAtoms_remote: *mut nsIAtom;
21672169
#[link_name = "_ZN9nsGkAtoms13removeelementE"]
21682170
pub static nsGkAtoms_removeelement: *mut nsIAtom;
21692171
#[link_name = "_ZN9nsGkAtoms21renderingobserverlistE"]
@@ -7179,6 +7181,8 @@ cfg_if! {
71797181
pub static nsGkAtoms_onreloadpage: *mut nsIAtom;
71807182
#[link_name = "?rem@nsGkAtoms@@2PEAVnsIAtom@@EA"]
71817183
pub static nsGkAtoms_rem: *mut nsIAtom;
7184+
#[link_name = "?remote@nsGkAtoms@@2PEAVnsIAtom@@EA"]
7185+
pub static nsGkAtoms_remote: *mut nsIAtom;
71827186
#[link_name = "?removeelement@nsGkAtoms@@2PEAVnsIAtom@@EA"]
71837187
pub static nsGkAtoms_removeelement: *mut nsIAtom;
71847188
#[link_name = "?renderingobserverlist@nsGkAtoms@@2PEAVnsIAtom@@EA"]
@@ -12194,6 +12198,8 @@ cfg_if! {
1219412198
pub static nsGkAtoms_onreloadpage: *mut nsIAtom;
1219512199
#[link_name = "\x01?rem@nsGkAtoms@@2PAVnsIAtom@@A"]
1219612200
pub static nsGkAtoms_rem: *mut nsIAtom;
12201+
#[link_name = "\x01?remote@nsGkAtoms@@2PAVnsIAtom@@A"]
12202+
pub static nsGkAtoms_remote: *mut nsIAtom;
1219712203
#[link_name = "\x01?removeelement@nsGkAtoms@@2PAVnsIAtom@@A"]
1219812204
pub static nsGkAtoms_removeelement: *mut nsIAtom;
1219912205
#[link_name = "\x01?renderingobserverlist@nsGkAtoms@@2PAVnsIAtom@@A"]
@@ -17212,6 +17218,8 @@ macro_rules! atom {
1721217218
{ unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_onreloadpage as *mut _) } };
1721317219
("rem") =>
1721417220
{ unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_rem as *mut _) } };
17221+
("remote") =>
17222+
{ unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_remote as *mut _) } };
1721517223
("removeelement") =>
1721617224
{ unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_removeelement as *mut _) } };
1721717225
("renderingobserverlist") =>

0 commit comments

Comments
 (0)