Skip to content

Commit 45799f6

Browse files
emilioemilio
committed
style: Bump bindgen version.
This should fix bug 1365488, and also the template instantiation test noise reported at rust-lang/rust-bindgen#619.
1 parent d98abe1 commit 45799f6

File tree

4 files changed

+11557
-3678
lines changed

4 files changed

+11557
-3678
lines changed

‎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") =>

‎components/style/gecko/generated/bindings.rs

+81-94
Original file line numberDiff line numberDiff line change
@@ -202,80 +202,6 @@ use gecko_bindings::structs::ParsingMode;
202202
use gecko_bindings::structs::InheritTarget;
203203
use gecko_bindings::structs::URLMatchingFunction;
204204
pub type nsTArrayBorrowed_uintptr_t<'a> = &'a mut ::gecko_bindings::structs::nsTArray<usize>;
205-
pub type ServoCssRulesStrong = ::gecko_bindings::sugar::ownership::Strong<ServoCssRules>;
206-
pub type ServoCssRulesBorrowed<'a> = &'a ServoCssRules;
207-
pub type ServoCssRulesBorrowedOrNull<'a> = Option<&'a ServoCssRules>;
208-
enum ServoCssRulesVoid { }
209-
pub struct ServoCssRules(ServoCssRulesVoid);
210-
pub type RawServoStyleSheetStrong = ::gecko_bindings::sugar::ownership::Strong<RawServoStyleSheet>;
211-
pub type RawServoStyleSheetBorrowed<'a> = &'a RawServoStyleSheet;
212-
pub type RawServoStyleSheetBorrowedOrNull<'a> = Option<&'a RawServoStyleSheet>;
213-
enum RawServoStyleSheetVoid { }
214-
pub struct RawServoStyleSheet(RawServoStyleSheetVoid);
215-
pub type ServoComputedValuesStrong = ::gecko_bindings::sugar::ownership::Strong<ServoComputedValues>;
216-
pub type ServoComputedValuesBorrowed<'a> = &'a ServoComputedValues;
217-
pub type ServoComputedValuesBorrowedOrNull<'a> = Option<&'a ServoComputedValues>;
218-
enum ServoComputedValuesVoid { }
219-
pub struct ServoComputedValues(ServoComputedValuesVoid);
220-
pub type RawServoDeclarationBlockStrong = ::gecko_bindings::sugar::ownership::Strong<RawServoDeclarationBlock>;
221-
pub type RawServoDeclarationBlockBorrowed<'a> = &'a RawServoDeclarationBlock;
222-
pub type RawServoDeclarationBlockBorrowedOrNull<'a> = Option<&'a RawServoDeclarationBlock>;
223-
pub type RawServoStyleRuleStrong = ::gecko_bindings::sugar::ownership::Strong<RawServoStyleRule>;
224-
pub type RawServoStyleRuleBorrowed<'a> = &'a RawServoStyleRule;
225-
pub type RawServoStyleRuleBorrowedOrNull<'a> = Option<&'a RawServoStyleRule>;
226-
pub type RawServoImportRuleStrong = ::gecko_bindings::sugar::ownership::Strong<RawServoImportRule>;
227-
pub type RawServoImportRuleBorrowed<'a> = &'a RawServoImportRule;
228-
pub type RawServoImportRuleBorrowedOrNull<'a> = Option<&'a RawServoImportRule>;
229-
enum RawServoImportRuleVoid { }
230-
pub struct RawServoImportRule(RawServoImportRuleVoid);
231-
pub type RawServoAnimationValueStrong = ::gecko_bindings::sugar::ownership::Strong<RawServoAnimationValue>;
232-
pub type RawServoAnimationValueBorrowed<'a> = &'a RawServoAnimationValue;
233-
pub type RawServoAnimationValueBorrowedOrNull<'a> = Option<&'a RawServoAnimationValue>;
234-
pub type RawServoKeyframeStrong = ::gecko_bindings::sugar::ownership::Strong<RawServoKeyframe>;
235-
pub type RawServoKeyframeBorrowed<'a> = &'a RawServoKeyframe;
236-
pub type RawServoKeyframeBorrowedOrNull<'a> = Option<&'a RawServoKeyframe>;
237-
enum RawServoKeyframeVoid { }
238-
pub struct RawServoKeyframe(RawServoKeyframeVoid);
239-
pub type RawServoKeyframesRuleStrong = ::gecko_bindings::sugar::ownership::Strong<RawServoKeyframesRule>;
240-
pub type RawServoKeyframesRuleBorrowed<'a> = &'a RawServoKeyframesRule;
241-
pub type RawServoKeyframesRuleBorrowedOrNull<'a> = Option<&'a RawServoKeyframesRule>;
242-
enum RawServoKeyframesRuleVoid { }
243-
pub struct RawServoKeyframesRule(RawServoKeyframesRuleVoid);
244-
pub type RawServoMediaListStrong = ::gecko_bindings::sugar::ownership::Strong<RawServoMediaList>;
245-
pub type RawServoMediaListBorrowed<'a> = &'a RawServoMediaList;
246-
pub type RawServoMediaListBorrowedOrNull<'a> = Option<&'a RawServoMediaList>;
247-
enum RawServoMediaListVoid { }
248-
pub struct RawServoMediaList(RawServoMediaListVoid);
249-
pub type RawServoMediaRuleStrong = ::gecko_bindings::sugar::ownership::Strong<RawServoMediaRule>;
250-
pub type RawServoMediaRuleBorrowed<'a> = &'a RawServoMediaRule;
251-
pub type RawServoMediaRuleBorrowedOrNull<'a> = Option<&'a RawServoMediaRule>;
252-
enum RawServoMediaRuleVoid { }
253-
pub struct RawServoMediaRule(RawServoMediaRuleVoid);
254-
pub type RawServoNamespaceRuleStrong = ::gecko_bindings::sugar::ownership::Strong<RawServoNamespaceRule>;
255-
pub type RawServoNamespaceRuleBorrowed<'a> = &'a RawServoNamespaceRule;
256-
pub type RawServoNamespaceRuleBorrowedOrNull<'a> = Option<&'a RawServoNamespaceRule>;
257-
enum RawServoNamespaceRuleVoid { }
258-
pub struct RawServoNamespaceRule(RawServoNamespaceRuleVoid);
259-
pub type RawServoPageRuleStrong = ::gecko_bindings::sugar::ownership::Strong<RawServoPageRule>;
260-
pub type RawServoPageRuleBorrowed<'a> = &'a RawServoPageRule;
261-
pub type RawServoPageRuleBorrowedOrNull<'a> = Option<&'a RawServoPageRule>;
262-
enum RawServoPageRuleVoid { }
263-
pub struct RawServoPageRule(RawServoPageRuleVoid);
264-
pub type RawServoSupportsRuleStrong = ::gecko_bindings::sugar::ownership::Strong<RawServoSupportsRule>;
265-
pub type RawServoSupportsRuleBorrowed<'a> = &'a RawServoSupportsRule;
266-
pub type RawServoSupportsRuleBorrowedOrNull<'a> = Option<&'a RawServoSupportsRule>;
267-
enum RawServoSupportsRuleVoid { }
268-
pub struct RawServoSupportsRule(RawServoSupportsRuleVoid);
269-
pub type RawServoDocumentRuleStrong = ::gecko_bindings::sugar::ownership::Strong<RawServoDocumentRule>;
270-
pub type RawServoDocumentRuleBorrowed<'a> = &'a RawServoDocumentRule;
271-
pub type RawServoDocumentRuleBorrowedOrNull<'a> = Option<&'a RawServoDocumentRule>;
272-
enum RawServoDocumentRuleVoid { }
273-
pub struct RawServoDocumentRule(RawServoDocumentRuleVoid);
274-
pub type RawServoRuleNodeStrong = ::gecko_bindings::sugar::ownership::Strong<RawServoRuleNode>;
275-
pub type RawServoRuleNodeBorrowed<'a> = &'a RawServoRuleNode;
276-
pub type RawServoRuleNodeBorrowedOrNull<'a> = Option<&'a RawServoRuleNode>;
277-
enum RawServoRuleNodeVoid { }
278-
pub struct RawServoRuleNode(RawServoRuleNodeVoid);
279205
pub type RawServoStyleSetOwned = ::gecko_bindings::sugar::ownership::Owned<RawServoStyleSet>;
280206
pub type RawServoStyleSetOwnedOrNull = ::gecko_bindings::sugar::ownership::OwnedOrNull<RawServoStyleSet>;
281207
pub type RawServoStyleSetBorrowed<'a> = &'a RawServoStyleSet;
@@ -342,6 +268,10 @@ pub type RawGeckoComputedTimingBorrowed<'a> = &'a RawGeckoComputedTiming;
342268
pub type RawGeckoComputedTimingBorrowedOrNull<'a> = Option<&'a RawGeckoComputedTiming>;
343269
pub type RawGeckoComputedTimingBorrowedMut<'a> = &'a mut RawGeckoComputedTiming;
344270
pub type RawGeckoComputedTimingBorrowedMutOrNull<'a> = Option<&'a mut RawGeckoComputedTiming>;
271+
pub type RawGeckoCSSPropertyIDListBorrowed<'a> = &'a RawGeckoCSSPropertyIDList;
272+
pub type RawGeckoCSSPropertyIDListBorrowedOrNull<'a> = Option<&'a RawGeckoCSSPropertyIDList>;
273+
pub type RawGeckoCSSPropertyIDListBorrowedMut<'a> = &'a mut RawGeckoCSSPropertyIDList;
274+
pub type RawGeckoCSSPropertyIDListBorrowedMutOrNull<'a> = Option<&'a mut RawGeckoCSSPropertyIDList>;
345275
pub type RawGeckoKeyframeListBorrowed<'a> = &'a RawGeckoKeyframeList;
346276
pub type RawGeckoKeyframeListBorrowedOrNull<'a> = Option<&'a RawGeckoKeyframeList>;
347277
pub type RawGeckoKeyframeListBorrowedMut<'a> = &'a mut RawGeckoKeyframeList;
@@ -358,10 +288,80 @@ pub type RawGeckoServoStyleRuleListBorrowed<'a> = &'a RawGeckoServoStyleRuleList
358288
pub type RawGeckoServoStyleRuleListBorrowedOrNull<'a> = Option<&'a RawGeckoServoStyleRuleList>;
359289
pub type RawGeckoServoStyleRuleListBorrowedMut<'a> = &'a mut RawGeckoServoStyleRuleList;
360290
pub type RawGeckoServoStyleRuleListBorrowedMutOrNull<'a> = Option<&'a mut RawGeckoServoStyleRuleList>;
361-
pub type RawGeckoCSSPropertyIDListBorrowed<'a> = &'a RawGeckoCSSPropertyIDList;
362-
pub type RawGeckoCSSPropertyIDListBorrowedOrNull<'a> = Option<&'a RawGeckoCSSPropertyIDList>;
363-
pub type RawGeckoCSSPropertyIDListBorrowedMut<'a> = &'a mut RawGeckoCSSPropertyIDList;
364-
pub type RawGeckoCSSPropertyIDListBorrowedMutOrNull<'a> = Option<&'a mut RawGeckoCSSPropertyIDList>;
291+
pub type ServoCssRulesStrong = ::gecko_bindings::sugar::ownership::Strong<ServoCssRules>;
292+
pub type ServoCssRulesBorrowed<'a> = &'a ServoCssRules;
293+
pub type ServoCssRulesBorrowedOrNull<'a> = Option<&'a ServoCssRules>;
294+
enum ServoCssRulesVoid { }
295+
pub struct ServoCssRules(ServoCssRulesVoid);
296+
pub type RawServoStyleSheetStrong = ::gecko_bindings::sugar::ownership::Strong<RawServoStyleSheet>;
297+
pub type RawServoStyleSheetBorrowed<'a> = &'a RawServoStyleSheet;
298+
pub type RawServoStyleSheetBorrowedOrNull<'a> = Option<&'a RawServoStyleSheet>;
299+
enum RawServoStyleSheetVoid { }
300+
pub struct RawServoStyleSheet(RawServoStyleSheetVoid);
301+
pub type ServoComputedValuesStrong = ::gecko_bindings::sugar::ownership::Strong<ServoComputedValues>;
302+
pub type ServoComputedValuesBorrowed<'a> = &'a ServoComputedValues;
303+
pub type ServoComputedValuesBorrowedOrNull<'a> = Option<&'a ServoComputedValues>;
304+
enum ServoComputedValuesVoid { }
305+
pub struct ServoComputedValues(ServoComputedValuesVoid);
306+
pub type RawServoDeclarationBlockStrong = ::gecko_bindings::sugar::ownership::Strong<RawServoDeclarationBlock>;
307+
pub type RawServoDeclarationBlockBorrowed<'a> = &'a RawServoDeclarationBlock;
308+
pub type RawServoDeclarationBlockBorrowedOrNull<'a> = Option<&'a RawServoDeclarationBlock>;
309+
pub type RawServoStyleRuleStrong = ::gecko_bindings::sugar::ownership::Strong<RawServoStyleRule>;
310+
pub type RawServoStyleRuleBorrowed<'a> = &'a RawServoStyleRule;
311+
pub type RawServoStyleRuleBorrowedOrNull<'a> = Option<&'a RawServoStyleRule>;
312+
pub type RawServoImportRuleStrong = ::gecko_bindings::sugar::ownership::Strong<RawServoImportRule>;
313+
pub type RawServoImportRuleBorrowed<'a> = &'a RawServoImportRule;
314+
pub type RawServoImportRuleBorrowedOrNull<'a> = Option<&'a RawServoImportRule>;
315+
enum RawServoImportRuleVoid { }
316+
pub struct RawServoImportRule(RawServoImportRuleVoid);
317+
pub type RawServoAnimationValueStrong = ::gecko_bindings::sugar::ownership::Strong<RawServoAnimationValue>;
318+
pub type RawServoAnimationValueBorrowed<'a> = &'a RawServoAnimationValue;
319+
pub type RawServoAnimationValueBorrowedOrNull<'a> = Option<&'a RawServoAnimationValue>;
320+
pub type RawServoKeyframeStrong = ::gecko_bindings::sugar::ownership::Strong<RawServoKeyframe>;
321+
pub type RawServoKeyframeBorrowed<'a> = &'a RawServoKeyframe;
322+
pub type RawServoKeyframeBorrowedOrNull<'a> = Option<&'a RawServoKeyframe>;
323+
enum RawServoKeyframeVoid { }
324+
pub struct RawServoKeyframe(RawServoKeyframeVoid);
325+
pub type RawServoKeyframesRuleStrong = ::gecko_bindings::sugar::ownership::Strong<RawServoKeyframesRule>;
326+
pub type RawServoKeyframesRuleBorrowed<'a> = &'a RawServoKeyframesRule;
327+
pub type RawServoKeyframesRuleBorrowedOrNull<'a> = Option<&'a RawServoKeyframesRule>;
328+
enum RawServoKeyframesRuleVoid { }
329+
pub struct RawServoKeyframesRule(RawServoKeyframesRuleVoid);
330+
pub type RawServoMediaListStrong = ::gecko_bindings::sugar::ownership::Strong<RawServoMediaList>;
331+
pub type RawServoMediaListBorrowed<'a> = &'a RawServoMediaList;
332+
pub type RawServoMediaListBorrowedOrNull<'a> = Option<&'a RawServoMediaList>;
333+
enum RawServoMediaListVoid { }
334+
pub struct RawServoMediaList(RawServoMediaListVoid);
335+
pub type RawServoMediaRuleStrong = ::gecko_bindings::sugar::ownership::Strong<RawServoMediaRule>;
336+
pub type RawServoMediaRuleBorrowed<'a> = &'a RawServoMediaRule;
337+
pub type RawServoMediaRuleBorrowedOrNull<'a> = Option<&'a RawServoMediaRule>;
338+
enum RawServoMediaRuleVoid { }
339+
pub struct RawServoMediaRule(RawServoMediaRuleVoid);
340+
pub type RawServoNamespaceRuleStrong = ::gecko_bindings::sugar::ownership::Strong<RawServoNamespaceRule>;
341+
pub type RawServoNamespaceRuleBorrowed<'a> = &'a RawServoNamespaceRule;
342+
pub type RawServoNamespaceRuleBorrowedOrNull<'a> = Option<&'a RawServoNamespaceRule>;
343+
enum RawServoNamespaceRuleVoid { }
344+
pub struct RawServoNamespaceRule(RawServoNamespaceRuleVoid);
345+
pub type RawServoPageRuleStrong = ::gecko_bindings::sugar::ownership::Strong<RawServoPageRule>;
346+
pub type RawServoPageRuleBorrowed<'a> = &'a RawServoPageRule;
347+
pub type RawServoPageRuleBorrowedOrNull<'a> = Option<&'a RawServoPageRule>;
348+
enum RawServoPageRuleVoid { }
349+
pub struct RawServoPageRule(RawServoPageRuleVoid);
350+
pub type RawServoSupportsRuleStrong = ::gecko_bindings::sugar::ownership::Strong<RawServoSupportsRule>;
351+
pub type RawServoSupportsRuleBorrowed<'a> = &'a RawServoSupportsRule;
352+
pub type RawServoSupportsRuleBorrowedOrNull<'a> = Option<&'a RawServoSupportsRule>;
353+
enum RawServoSupportsRuleVoid { }
354+
pub struct RawServoSupportsRule(RawServoSupportsRuleVoid);
355+
pub type RawServoDocumentRuleStrong = ::gecko_bindings::sugar::ownership::Strong<RawServoDocumentRule>;
356+
pub type RawServoDocumentRuleBorrowed<'a> = &'a RawServoDocumentRule;
357+
pub type RawServoDocumentRuleBorrowedOrNull<'a> = Option<&'a RawServoDocumentRule>;
358+
enum RawServoDocumentRuleVoid { }
359+
pub struct RawServoDocumentRule(RawServoDocumentRuleVoid);
360+
pub type RawServoRuleNodeStrong = ::gecko_bindings::sugar::ownership::Strong<RawServoRuleNode>;
361+
pub type RawServoRuleNodeBorrowed<'a> = &'a RawServoRuleNode;
362+
pub type RawServoRuleNodeBorrowedOrNull<'a> = Option<&'a RawServoRuleNode>;
363+
enum RawServoRuleNodeVoid { }
364+
pub struct RawServoRuleNode(RawServoRuleNodeVoid);
365365

366366
extern "C" {
367367
pub fn Gecko_EnsureTArrayCapacity(aArray: *mut ::std::os::raw::c_void,
@@ -874,10 +874,6 @@ extern "C" {
874874
pub fn Gecko_SetLayerImageImageValue(image: *mut nsStyleImage,
875875
aImageValue: *mut ImageValue);
876876
}
877-
extern "C" {
878-
pub fn Gecko_SetUrlImageValue(image: *mut nsStyleImage,
879-
uri: ServoBundledURI);
880-
}
881877
extern "C" {
882878
pub fn Gecko_SetImageElement(image: *mut nsStyleImage,
883879
atom: *mut nsIAtom);
@@ -901,10 +897,6 @@ extern "C" {
901897
pub fn Gecko_SetListStyleImageImageValue(style_struct: *mut nsStyleList,
902898
aImageValue: *mut ImageValue);
903899
}
904-
extern "C" {
905-
pub fn Gecko_SetListStyleImage(style_struct: *mut nsStyleList,
906-
uri: ServoBundledURI);
907-
}
908900
extern "C" {
909901
pub fn Gecko_CopyListStyleImageFrom(dest: *mut nsStyleList,
910902
src: *const nsStyleList);
@@ -917,10 +909,6 @@ extern "C" {
917909
pub fn Gecko_SetCursorImageValue(aCursor: *mut nsCursorImage,
918910
aImageValue: *mut ImageValue);
919911
}
920-
extern "C" {
921-
pub fn Gecko_SetCursorImage(cursor: *mut nsCursorImage,
922-
uri: ServoBundledURI);
923-
}
924912
extern "C" {
925913
pub fn Gecko_CopyCursorArrayFrom(dest: *mut nsStyleUserInterface,
926914
src: *const nsStyleUserInterface);
@@ -929,10 +917,6 @@ extern "C" {
929917
pub fn Gecko_SetContentDataImageValue(aList: *mut nsStyleContentData,
930918
aImageValue: *mut ImageValue);
931919
}
932-
extern "C" {
933-
pub fn Gecko_SetContentDataImage(content_data: *mut nsStyleContentData,
934-
uri: ServoBundledURI);
935-
}
936920
extern "C" {
937921
pub fn Gecko_SetContentDataArray(content_data: *mut nsStyleContentData,
938922
type_: nsStyleContentType, len: u32);
@@ -1751,6 +1735,9 @@ extern "C" {
17511735
pub fn Servo_StyleSet_Init(pres_context: RawGeckoPresContextOwned)
17521736
-> RawServoStyleSetOwned;
17531737
}
1738+
extern "C" {
1739+
pub fn Servo_StyleSet_Clear(set: RawServoStyleSetBorrowed);
1740+
}
17541741
extern "C" {
17551742
pub fn Servo_StyleSet_RebuildData(set: RawServoStyleSetBorrowed);
17561743
}

0 commit comments

Comments
 (0)