diff --git a/book/src/blacklisting.md b/book/src/blacklisting.md index 3553d8b296..8d4ee163bf 100644 --- a/book/src/blacklisting.md +++ b/book/src/blacklisting.md @@ -14,7 +14,7 @@ not. ### Library -* [`bindgen::Builder::hide_type`](https://docs.rs/bindgen/0.23.1/bindgen/struct.Builder.html#method.hide_type) +* [`bindgen::Builder::blacklist_type`](https://docs.rs/bindgen/0.31.3/bindgen/struct.Builder.html#method.blacklist_type) ### Command Line diff --git a/tests/stylo_sanity.rs b/tests/stylo_sanity.rs index 56bfcaa8b5..d2d2e841b5 100755 --- a/tests/stylo_sanity.rs +++ b/tests/stylo_sanity.rs @@ -27,209 +27,209 @@ fn sanity_check_can_generate_stylo_bindings() { bindgen::builder() .time_phases(true) .header(concat!(env!("CARGO_MANIFEST_DIR"), "/tests/stylo.hpp")) - .whitelisted_function("Servo_.*") - .whitelisted_function("Gecko_.*") - .hide_type("nsACString_internal") - .hide_type("nsAString_internal") - .hide_type("mozilla::css::URLValue") - .hide_type("RawGeckoAnimationPropertySegment") - .hide_type("RawGeckoComputedTiming") - .hide_type("RawGeckoDocument") - .hide_type("RawGeckoElement") - .hide_type("RawGeckoKeyframeList") - .hide_type("RawGeckoComputedKeyframeValuesList") - .hide_type("RawGeckoFontFaceRuleList") - .hide_type("RawGeckoNode") - .hide_type("RawGeckoAnimationValueList") - .hide_type("RawServoAnimationValue") - .hide_type("RawServoAnimationValueMap") - .hide_type("RawServoDeclarationBlock") - .hide_type("RawGeckoPresContext") - .hide_type("RawGeckoPresContextOwned") - .hide_type("RawGeckoStyleAnimationList") - .hide_type("RawGeckoURLExtraData") - .hide_type("RefPtr") - .hide_type("CSSPseudoClassType") - .hide_type("TraversalRootBehavior") - .hide_type("ComputedTimingFunction_BeforeFlag") - .hide_type("FontFamilyList") - .hide_type("FontFamilyType") - .hide_type("Keyframe") - .hide_type("ServoBundledURI") - .hide_type("ServoElementSnapshot") - .hide_type("SheetParsingMode") - .hide_type("StyleBasicShape") - .hide_type("StyleBasicShapeType") - .hide_type("StyleShapeSource") - .hide_type("nsCSSFontFaceRule") - .hide_type("nsCSSKeyword") - .hide_type("nsCSSPropertyID") - .hide_type("nsCSSShadowArray") - .hide_type("nsCSSUnit") - .hide_type("nsCSSValue") - .hide_type("nsCSSValueSharedList") - .hide_type("nsChangeHint") - .hide_type("nsCursorImage") - .hide_type("nsFont") - .hide_type("nsIAtom") - .hide_type("nsMediaFeature") - .hide_type("nsRestyleHint") - .hide_type("nsStyleBackground") - .hide_type("nsStyleBorder") - .hide_type("nsStyleColor") - .hide_type("nsStyleColumn") - .hide_type("nsStyleContent") - .hide_type("nsStyleContentData") - .hide_type("nsStyleContentType") - .hide_type("nsStyleContext") - .hide_type("nsStyleCoord") - .hide_type("nsStyleCoord_Calc") - .hide_type("nsStyleCoord_CalcValue") - .hide_type("nsStyleDisplay") - .hide_type("nsStyleEffects") - .hide_type("nsStyleFilter") - .hide_type("nsStyleFont") - .hide_type("nsStyleGradient") - .hide_type("nsStyleGradientStop") - .hide_type("nsStyleImage") - .hide_type("nsStyleImageLayers") - .hide_type("nsStyleImageLayers_Layer") - .hide_type("nsStyleImageLayers_LayerType") - .hide_type("nsStyleImageRequest") - .hide_type("nsStyleList") - .hide_type("nsStyleMargin") - .hide_type("nsStyleOutline") - .hide_type("nsStylePadding") - .hide_type("nsStylePosition") - .hide_type("nsStyleQuoteValues") - .hide_type("nsStyleSVG") - .hide_type("nsStyleSVGPaint") - .hide_type("nsStyleSVGReset") - .hide_type("nsStyleTable") - .hide_type("nsStyleTableBorder") - .hide_type("nsStyleText") - .hide_type("nsStyleTextReset") - .hide_type("nsStyleUIReset") - .hide_type("nsStyleUnion") - .hide_type("nsStyleUnit") - .hide_type("nsStyleUserInterface") - .hide_type("nsStyleVariables") - .hide_type("nsStyleVisibility") - .hide_type("nsStyleXUL") - .hide_type("nsTimingFunction") - .hide_type("nscolor") - .hide_type("nscoord") - .hide_type("nsresult") - .hide_type("Loader") - .hide_type("ServoStyleSheet") - .hide_type("EffectCompositor_CascadeLevel") - .hide_type("UpdateAnimationsTasks") - .hide_type("nsTArrayBorrowed_uintptr_t") - .hide_type("ServoCssRulesStrong") - .hide_type("ServoCssRulesBorrowed") - .hide_type("ServoCssRulesBorrowedOrNull") - .hide_type("ServoCssRules") - .hide_type("RawServoStyleSheetStrong") - .hide_type("RawServoStyleSheetBorrowed") - .hide_type("RawServoStyleSheetBorrowedOrNull") - .hide_type("RawServoStyleSheet") - .hide_type("ServoComputedValuesStrong") - .hide_type("ServoComputedValuesBorrowed") - .hide_type("ServoComputedValuesBorrowedOrNull") - .hide_type("ServoComputedValues") - .hide_type("RawServoDeclarationBlockStrong") - .hide_type("RawServoDeclarationBlockBorrowed") - .hide_type("RawServoDeclarationBlockBorrowedOrNull") - .hide_type("RawServoStyleRuleStrong") - .hide_type("RawServoStyleRuleBorrowed") - .hide_type("RawServoStyleRuleBorrowedOrNull") - .hide_type("RawServoStyleRule") - .hide_type("RawServoImportRuleStrong") - .hide_type("RawServoImportRuleBorrowed") - .hide_type("RawServoImportRuleBorrowedOrNull") - .hide_type("RawServoImportRule") - .hide_type("RawServoAnimationValueStrong") - .hide_type("RawServoAnimationValueBorrowed") - .hide_type("RawServoAnimationValueBorrowedOrNull") - .hide_type("RawServoAnimationValueMapStrong") - .hide_type("RawServoAnimationValueMapBorrowed") - .hide_type("RawServoAnimationValueMapBorrowedOrNull") - .hide_type("RawServoMediaListStrong") - .hide_type("RawServoMediaListBorrowed") - .hide_type("RawServoMediaListBorrowedOrNull") - .hide_type("RawServoMediaList") - .hide_type("RawServoMediaRuleStrong") - .hide_type("RawServoMediaRuleBorrowed") - .hide_type("RawServoMediaRuleBorrowedOrNull") - .hide_type("RawServoMediaRule") - .hide_type("RawServoNamespaceRuleStrong") - .hide_type("RawServoNamespaceRuleBorrowed") - .hide_type("RawServoNamespaceRuleBorrowedOrNull") - .hide_type("RawServoNamespaceRule") - .hide_type("RawServoStyleSetOwned") - .hide_type("RawServoStyleSetOwnedOrNull") - .hide_type("RawServoStyleSetBorrowed") - .hide_type("RawServoStyleSetBorrowedOrNull") - .hide_type("RawServoStyleSetBorrowedMut") - .hide_type("RawServoStyleSetBorrowedMutOrNull") - .hide_type("RawServoStyleSet") - .hide_type("StyleChildrenIteratorOwned") - .hide_type("StyleChildrenIteratorOwnedOrNull") - .hide_type("StyleChildrenIteratorBorrowed") - .hide_type("StyleChildrenIteratorBorrowedOrNull") - .hide_type("StyleChildrenIteratorBorrowedMut") - .hide_type("StyleChildrenIteratorBorrowedMutOrNull") - .hide_type("StyleChildrenIterator") - .hide_type("ServoElementSnapshotOwned") - .hide_type("ServoElementSnapshotOwnedOrNull") - .hide_type("ServoElementSnapshotBorrowed") - .hide_type("ServoElementSnapshotBorrowedOrNull") - .hide_type("ServoElementSnapshotBorrowedMut") - .hide_type("ServoElementSnapshotBorrowedMutOrNull") - .hide_type("RawGeckoNodeBorrowed") - .hide_type("RawGeckoNodeBorrowedOrNull") - .hide_type("RawGeckoElementBorrowed") - .hide_type("RawGeckoElementBorrowedOrNull") - .hide_type("RawGeckoDocumentBorrowed") - .hide_type("RawGeckoDocumentBorrowedOrNull") - .hide_type("RawServoDeclarationBlockStrongBorrowed") - .hide_type("RawServoDeclarationBlockStrongBorrowedOrNull") - .hide_type("RawGeckoPresContextBorrowed") - .hide_type("RawGeckoPresContextBorrowedOrNull") - .hide_type("RawGeckoStyleAnimationListBorrowed") - .hide_type("RawGeckoStyleAnimationListBorrowedOrNull") - .hide_type("nsCSSValueBorrowed") - .hide_type("nsCSSValueBorrowedOrNull") - .hide_type("nsCSSValueBorrowedMut") - .hide_type("nsCSSValueBorrowedMutOrNull") - .hide_type("nsTimingFunctionBorrowed") - .hide_type("nsTimingFunctionBorrowedOrNull") - .hide_type("nsTimingFunctionBorrowedMut") - .hide_type("nsTimingFunctionBorrowedMutOrNull") - .hide_type("RawGeckoAnimationPropertySegmentBorrowed") - .hide_type("RawGeckoAnimationPropertySegmentBorrowedOrNull") - .hide_type("RawGeckoAnimationPropertySegmentBorrowedMut") - .hide_type("RawGeckoAnimationPropertySegmentBorrowedMutOrNull") - .hide_type("RawGeckoAnimationValueListBorrowed") - .hide_type("RawGeckoAnimationValueListBorrowedOrNull") - .hide_type("RawGeckoAnimationValueListBorrowedMut") - .hide_type("RawGeckoAnimationValueListBorrowedMutOrNull") - .hide_type("RawGeckoComputedTimingBorrowed") - .hide_type("RawGeckoComputedTimingBorrowedOrNull") - .hide_type("RawGeckoComputedTimingBorrowedMut") - .hide_type("RawGeckoComputedTimingBorrowedMutOrNull") - .hide_type("RawGeckoKeyframeListBorrowed") - .hide_type("RawGeckoKeyframeListBorrowedOrNull") - .hide_type("RawGeckoKeyframeListBorrowedMut") - .hide_type("RawGeckoKeyframeListBorrowedMutOrNull") - .hide_type("RawGeckoComputedKeyframeValuesListBorrowed") - .hide_type("RawGeckoComputedKeyframeValuesListBorrowedOrNull") - .hide_type("RawGeckoComputedKeyframeValuesListBorrowedMut") - .hide_type("RawGeckoComputedKeyframeValuesListBorrowedMutOrNull") - .hide_type("RawGeckoFontFaceRuleListBorrowed") - .hide_type("RawGeckoFontFaceRuleListBorrowedOrNull") - .hide_type("RawGeckoFontFaceRuleListBorrowedMut") - .hide_type("RawGeckoFontFaceRuleListBorrowedMutOrNull") + .whitelist_function("Servo_.*") + .whitelist_function("Gecko_.*") + .blacklist_type("nsACString_internal") + .blacklist_type("nsAString_internal") + .blacklist_type("mozilla::css::URLValue") + .blacklist_type("RawGeckoAnimationPropertySegment") + .blacklist_type("RawGeckoComputedTiming") + .blacklist_type("RawGeckoDocument") + .blacklist_type("RawGeckoElement") + .blacklist_type("RawGeckoKeyframeList") + .blacklist_type("RawGeckoComputedKeyframeValuesList") + .blacklist_type("RawGeckoFontFaceRuleList") + .blacklist_type("RawGeckoNode") + .blacklist_type("RawGeckoAnimationValueList") + .blacklist_type("RawServoAnimationValue") + .blacklist_type("RawServoAnimationValueMap") + .blacklist_type("RawServoDeclarationBlock") + .blacklist_type("RawGeckoPresContext") + .blacklist_type("RawGeckoPresContextOwned") + .blacklist_type("RawGeckoStyleAnimationList") + .blacklist_type("RawGeckoURLExtraData") + .blacklist_type("RefPtr") + .blacklist_type("CSSPseudoClassType") + .blacklist_type("TraversalRootBehavior") + .blacklist_type("ComputedTimingFunction_BeforeFlag") + .blacklist_type("FontFamilyList") + .blacklist_type("FontFamilyType") + .blacklist_type("Keyframe") + .blacklist_type("ServoBundledURI") + .blacklist_type("ServoElementSnapshot") + .blacklist_type("SheetParsingMode") + .blacklist_type("StyleBasicShape") + .blacklist_type("StyleBasicShapeType") + .blacklist_type("StyleShapeSource") + .blacklist_type("nsCSSFontFaceRule") + .blacklist_type("nsCSSKeyword") + .blacklist_type("nsCSSPropertyID") + .blacklist_type("nsCSSShadowArray") + .blacklist_type("nsCSSUnit") + .blacklist_type("nsCSSValue") + .blacklist_type("nsCSSValueSharedList") + .blacklist_type("nsChangeHint") + .blacklist_type("nsCursorImage") + .blacklist_type("nsFont") + .blacklist_type("nsIAtom") + .blacklist_type("nsMediaFeature") + .blacklist_type("nsRestyleHint") + .blacklist_type("nsStyleBackground") + .blacklist_type("nsStyleBorder") + .blacklist_type("nsStyleColor") + .blacklist_type("nsStyleColumn") + .blacklist_type("nsStyleContent") + .blacklist_type("nsStyleContentData") + .blacklist_type("nsStyleContentType") + .blacklist_type("nsStyleContext") + .blacklist_type("nsStyleCoord") + .blacklist_type("nsStyleCoord_Calc") + .blacklist_type("nsStyleCoord_CalcValue") + .blacklist_type("nsStyleDisplay") + .blacklist_type("nsStyleEffects") + .blacklist_type("nsStyleFilter") + .blacklist_type("nsStyleFont") + .blacklist_type("nsStyleGradient") + .blacklist_type("nsStyleGradientStop") + .blacklist_type("nsStyleImage") + .blacklist_type("nsStyleImageLayers") + .blacklist_type("nsStyleImageLayers_Layer") + .blacklist_type("nsStyleImageLayers_LayerType") + .blacklist_type("nsStyleImageRequest") + .blacklist_type("nsStyleList") + .blacklist_type("nsStyleMargin") + .blacklist_type("nsStyleOutline") + .blacklist_type("nsStylePadding") + .blacklist_type("nsStylePosition") + .blacklist_type("nsStyleQuoteValues") + .blacklist_type("nsStyleSVG") + .blacklist_type("nsStyleSVGPaint") + .blacklist_type("nsStyleSVGReset") + .blacklist_type("nsStyleTable") + .blacklist_type("nsStyleTableBorder") + .blacklist_type("nsStyleText") + .blacklist_type("nsStyleTextReset") + .blacklist_type("nsStyleUIReset") + .blacklist_type("nsStyleUnion") + .blacklist_type("nsStyleUnit") + .blacklist_type("nsStyleUserInterface") + .blacklist_type("nsStyleVariables") + .blacklist_type("nsStyleVisibility") + .blacklist_type("nsStyleXUL") + .blacklist_type("nsTimingFunction") + .blacklist_type("nscolor") + .blacklist_type("nscoord") + .blacklist_type("nsresult") + .blacklist_type("Loader") + .blacklist_type("ServoStyleSheet") + .blacklist_type("EffectCompositor_CascadeLevel") + .blacklist_type("UpdateAnimationsTasks") + .blacklist_type("nsTArrayBorrowed_uintptr_t") + .blacklist_type("ServoCssRulesStrong") + .blacklist_type("ServoCssRulesBorrowed") + .blacklist_type("ServoCssRulesBorrowedOrNull") + .blacklist_type("ServoCssRules") + .blacklist_type("RawServoStyleSheetStrong") + .blacklist_type("RawServoStyleSheetBorrowed") + .blacklist_type("RawServoStyleSheetBorrowedOrNull") + .blacklist_type("RawServoStyleSheet") + .blacklist_type("ServoComputedValuesStrong") + .blacklist_type("ServoComputedValuesBorrowed") + .blacklist_type("ServoComputedValuesBorrowedOrNull") + .blacklist_type("ServoComputedValues") + .blacklist_type("RawServoDeclarationBlockStrong") + .blacklist_type("RawServoDeclarationBlockBorrowed") + .blacklist_type("RawServoDeclarationBlockBorrowedOrNull") + .blacklist_type("RawServoStyleRuleStrong") + .blacklist_type("RawServoStyleRuleBorrowed") + .blacklist_type("RawServoStyleRuleBorrowedOrNull") + .blacklist_type("RawServoStyleRule") + .blacklist_type("RawServoImportRuleStrong") + .blacklist_type("RawServoImportRuleBorrowed") + .blacklist_type("RawServoImportRuleBorrowedOrNull") + .blacklist_type("RawServoImportRule") + .blacklist_type("RawServoAnimationValueStrong") + .blacklist_type("RawServoAnimationValueBorrowed") + .blacklist_type("RawServoAnimationValueBorrowedOrNull") + .blacklist_type("RawServoAnimationValueMapStrong") + .blacklist_type("RawServoAnimationValueMapBorrowed") + .blacklist_type("RawServoAnimationValueMapBorrowedOrNull") + .blacklist_type("RawServoMediaListStrong") + .blacklist_type("RawServoMediaListBorrowed") + .blacklist_type("RawServoMediaListBorrowedOrNull") + .blacklist_type("RawServoMediaList") + .blacklist_type("RawServoMediaRuleStrong") + .blacklist_type("RawServoMediaRuleBorrowed") + .blacklist_type("RawServoMediaRuleBorrowedOrNull") + .blacklist_type("RawServoMediaRule") + .blacklist_type("RawServoNamespaceRuleStrong") + .blacklist_type("RawServoNamespaceRuleBorrowed") + .blacklist_type("RawServoNamespaceRuleBorrowedOrNull") + .blacklist_type("RawServoNamespaceRule") + .blacklist_type("RawServoStyleSetOwned") + .blacklist_type("RawServoStyleSetOwnedOrNull") + .blacklist_type("RawServoStyleSetBorrowed") + .blacklist_type("RawServoStyleSetBorrowedOrNull") + .blacklist_type("RawServoStyleSetBorrowedMut") + .blacklist_type("RawServoStyleSetBorrowedMutOrNull") + .blacklist_type("RawServoStyleSet") + .blacklist_type("StyleChildrenIteratorOwned") + .blacklist_type("StyleChildrenIteratorOwnedOrNull") + .blacklist_type("StyleChildrenIteratorBorrowed") + .blacklist_type("StyleChildrenIteratorBorrowedOrNull") + .blacklist_type("StyleChildrenIteratorBorrowedMut") + .blacklist_type("StyleChildrenIteratorBorrowedMutOrNull") + .blacklist_type("StyleChildrenIterator") + .blacklist_type("ServoElementSnapshotOwned") + .blacklist_type("ServoElementSnapshotOwnedOrNull") + .blacklist_type("ServoElementSnapshotBorrowed") + .blacklist_type("ServoElementSnapshotBorrowedOrNull") + .blacklist_type("ServoElementSnapshotBorrowedMut") + .blacklist_type("ServoElementSnapshotBorrowedMutOrNull") + .blacklist_type("RawGeckoNodeBorrowed") + .blacklist_type("RawGeckoNodeBorrowedOrNull") + .blacklist_type("RawGeckoElementBorrowed") + .blacklist_type("RawGeckoElementBorrowedOrNull") + .blacklist_type("RawGeckoDocumentBorrowed") + .blacklist_type("RawGeckoDocumentBorrowedOrNull") + .blacklist_type("RawServoDeclarationBlockStrongBorrowed") + .blacklist_type("RawServoDeclarationBlockStrongBorrowedOrNull") + .blacklist_type("RawGeckoPresContextBorrowed") + .blacklist_type("RawGeckoPresContextBorrowedOrNull") + .blacklist_type("RawGeckoStyleAnimationListBorrowed") + .blacklist_type("RawGeckoStyleAnimationListBorrowedOrNull") + .blacklist_type("nsCSSValueBorrowed") + .blacklist_type("nsCSSValueBorrowedOrNull") + .blacklist_type("nsCSSValueBorrowedMut") + .blacklist_type("nsCSSValueBorrowedMutOrNull") + .blacklist_type("nsTimingFunctionBorrowed") + .blacklist_type("nsTimingFunctionBorrowedOrNull") + .blacklist_type("nsTimingFunctionBorrowedMut") + .blacklist_type("nsTimingFunctionBorrowedMutOrNull") + .blacklist_type("RawGeckoAnimationPropertySegmentBorrowed") + .blacklist_type("RawGeckoAnimationPropertySegmentBorrowedOrNull") + .blacklist_type("RawGeckoAnimationPropertySegmentBorrowedMut") + .blacklist_type("RawGeckoAnimationPropertySegmentBorrowedMutOrNull") + .blacklist_type("RawGeckoAnimationValueListBorrowed") + .blacklist_type("RawGeckoAnimationValueListBorrowedOrNull") + .blacklist_type("RawGeckoAnimationValueListBorrowedMut") + .blacklist_type("RawGeckoAnimationValueListBorrowedMutOrNull") + .blacklist_type("RawGeckoComputedTimingBorrowed") + .blacklist_type("RawGeckoComputedTimingBorrowedOrNull") + .blacklist_type("RawGeckoComputedTimingBorrowedMut") + .blacklist_type("RawGeckoComputedTimingBorrowedMutOrNull") + .blacklist_type("RawGeckoKeyframeListBorrowed") + .blacklist_type("RawGeckoKeyframeListBorrowedOrNull") + .blacklist_type("RawGeckoKeyframeListBorrowedMut") + .blacklist_type("RawGeckoKeyframeListBorrowedMutOrNull") + .blacklist_type("RawGeckoComputedKeyframeValuesListBorrowed") + .blacklist_type("RawGeckoComputedKeyframeValuesListBorrowedOrNull") + .blacklist_type("RawGeckoComputedKeyframeValuesListBorrowedMut") + .blacklist_type("RawGeckoComputedKeyframeValuesListBorrowedMutOrNull") + .blacklist_type("RawGeckoFontFaceRuleListBorrowed") + .blacklist_type("RawGeckoFontFaceRuleListBorrowedOrNull") + .blacklist_type("RawGeckoFontFaceRuleListBorrowedMut") + .blacklist_type("RawGeckoFontFaceRuleListBorrowedMutOrNull") .raw_line(r#"pub use nsstring::{nsACString, nsAString, nsString};"#) .raw_line(r#"type nsACString_internal = nsACString;"#) .raw_line(r#"type nsAString_internal = nsAString;"#)