From d5bd89d9a007c98bf85c81060d668f6913ad403e Mon Sep 17 00:00:00 2001
From: Nicholas Nethercote <nnethercote@mozilla.com>
Date: Wed, 7 Aug 2019 04:17:22 +0000
Subject: [PATCH] Bug 1563555 - Don't bindgen static prefs. r=emilio

Bindgen is no longer necessary now that Rust bindings are generated by
generate_static_pref_list.py.

Differential Revision: https://phabricator.services.mozilla.com/D40793

--HG--
extra : moz-landing-system : lando
---
 layout/style/ServoBindings.toml            | 3 ---
 modules/libpref/init/StaticPrefListBegin.h | 3 +--
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/layout/style/ServoBindings.toml b/layout/style/ServoBindings.toml
index e49c09ec51ae..18ed06b669de 100644
--- a/layout/style/ServoBindings.toml
+++ b/layout/style/ServoBindings.toml
@@ -24,7 +24,6 @@ headers = [
     "mozilla/dom/ChildIterator.h",
     "mozilla/dom/NameSpaceConstants.h",
     "mozilla/LookAndFeel.h",
-    "mozilla/StaticPrefsAll.h",
     "mozilla/GeckoBindings.h",
     "mozilla/ServoBindings.h",
     "mozilla/ComputedStyle.h",
@@ -161,7 +160,6 @@ whitelist-vars = [
     "mozilla::detail::gGkAtoms",
     "mozilla::detail::kGkAtomsArrayOffset",
     "mozilla::profiler::detail::RacyFeatures::sActiveAndFeatures",
-    "mozilla::StaticPrefs::.*",
 ]
 # TODO(emilio): A bunch of types here can go away once we generate bindings and
 # structs together.
@@ -202,7 +200,6 @@ whitelist-types = [
     "mozilla::OriginFlags",
     "mozilla::PropertyStyleAnimationValuePair",
     "mozilla::ServoTraversalFlags",
-    "mozilla::StaticPrefs",
     "mozilla::StyleShapeRadius",
     "mozilla::StyleGrid.*",
     "mozilla::UpdateAnimationsTasks",
diff --git a/modules/libpref/init/StaticPrefListBegin.h b/modules/libpref/init/StaticPrefListBegin.h
index 942dbca628d0..33d2f05de5df 100644
--- a/modules/libpref/init/StaticPrefListBegin.h
+++ b/modules/libpref/init/StaticPrefListBegin.h
@@ -15,8 +15,7 @@ namespace mozilla {
 namespace StaticPrefs {
 
 // For mirrored prefs we generate an extern variable declaration and three
-// getter declarations/definitions. The extern declaration of the variable is
-// necessary for bindgen to see it and generate Rust bindings.
+// getter declarations/definitions.
 #define NEVER_PREF(name, cpp_type, default_value)
 #define ALWAYS_PREF(name, base_id, full_id, cpp_type, default_value)          \
   extern cpp_type sVarCache_##full_id;                                        \