Auto merge of #19830 - emilio:bindgen-up, r=SimonSapin

Update bindgen.

Bug: 1432134
Reviewed-by: SimonSapin
MozReview-Commit-ID: GXHw7KcCLN9

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/19830)
<!-- Reviewable:end -->

Cargo.lock

@@ -148,7 +148,7 @@ dependencies = [
 
 [[package]]
 name = "bindgen"
-version = "0.31.3"
+version = "0.32.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "cexpr 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -156,7 +156,7 @@ dependencies = [
  "clang-sys 0.21.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "clap 2.28.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "peeking_take_while 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2934,7 +2934,7 @@ dependencies = [
  "app_units 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "arrayvec 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "atomic_refcell 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "bindgen 0.31.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bindgen 0.32.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "bitflags 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "byteorder 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3578,7 +3578,7 @@ dependencies = [
 "checksum base64 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "96434f987501f0ed4eb336a411e0631ecd1afa11574fe148587adc4ff96143c9"
 "checksum binary-space-partition 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "88ceb0d16c4fd0e42876e298d7d3ce3780dd9ebdcbe4199816a32c77e08597ff"
 "checksum bincode 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9a6301db0b49fb63551bc15b5ae348147101cdf323242b93ec7546d5002ff1af"
-"checksum bindgen 0.31.3 (registry+https://github.com/rust-lang/crates.io-index)" = "57253399c086f4f29e57ffd3b5cdbc23a806a00292619351aa4cfa39cb49d4ea"
+"checksum bindgen 0.32.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6ed9557522980fcdb4986097c2ea9d2504eafa7e5818f393110205b5325a52ce"
 "checksum bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4efd02e230a02e18f92fc2735f44597385ed02ad8f831e7c1c1156ee5e1ab3a5"
 "checksum bitflags 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f5cde24d1b2e2216a726368b2363a273739c91f4e3eb4e0dd12d672d396ad989"
 "checksum bitreader 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "80b13e2ab064ff3aa0bdbf1eff533f9822dc37899821f5f98c67f263eab51707"

components/style/Cargo.toml

@@ -75,7 +75,7 @@ kernel32-sys = "0.2"
 [build-dependencies]
 lazy_static = "1"
 log = "0.3"
-bindgen = { version = "0.31.2", optional = true }
+bindgen = { version = "0.32.2", optional = true }
 regex = {version = "0.2", optional = true}
 walkdir = "1.0"
 toml = {version = "0.2.1", optional = true, default-features = false}

components/style/build_gecko.rs

@@ -205,7 +205,6 @@ mod bindings {
             // Disable rust unions, because we replace some types inside of
             // them.
             let mut builder = Builder::default()
-                .rustfmt_bindings(false)
                 .rust_target(RustTarget::Stable_1_0);
             for dir in SEARCH_PATHS.iter() {
                 builder = builder.clang_arg("-I").clang_arg(dir.to_str().unwrap());

components/style/gecko/generated/atom_macro.rs

@@ -5178,8 +5178,6 @@ cfg_if! {
             pub static nsCSSAnonBoxes_mozTreeCellText: *mut nsICSSAnonBoxPseudo;
             #[link_name = "_ZN14nsCSSAnonBoxes15mozTreeCheckboxE"]
             pub static nsCSSAnonBoxes_mozTreeCheckbox: *mut nsICSSAnonBoxPseudo;
-            #[link_name = "_ZN14nsCSSAnonBoxes20mozTreeProgressmeterE"]
-            pub static nsCSSAnonBoxes_mozTreeProgressmeter: *mut nsICSSAnonBoxPseudo;
             #[link_name = "_ZN14nsCSSAnonBoxes19mozTreeDropFeedbackE"]
             pub static nsCSSAnonBoxes_mozTreeDropFeedback: *mut nsICSSAnonBoxPseudo;
             #[link_name = "_ZN14nsCSSAnonBoxes21mozSVGMarkerAnonChildE"]
@@ -10351,8 +10349,6 @@ cfg_if! {
             pub static nsCSSAnonBoxes_mozTreeCellText: *mut nsICSSAnonBoxPseudo;
             #[link_name = "?mozTreeCheckbox@nsCSSAnonBoxes@@2PEAVnsICSSAnonBoxPseudo@@EA"]
             pub static nsCSSAnonBoxes_mozTreeCheckbox: *mut nsICSSAnonBoxPseudo;
-            #[link_name = "?mozTreeProgressmeter@nsCSSAnonBoxes@@2PEAVnsICSSAnonBoxPseudo@@EA"]
-            pub static nsCSSAnonBoxes_mozTreeProgressmeter: *mut nsICSSAnonBoxPseudo;
             #[link_name = "?mozTreeDropFeedback@nsCSSAnonBoxes@@2PEAVnsICSSAnonBoxPseudo@@EA"]
             pub static nsCSSAnonBoxes_mozTreeDropFeedback: *mut nsICSSAnonBoxPseudo;
             #[link_name = "?mozSVGMarkerAnonChild@nsCSSAnonBoxes@@2PEAVnsICSSAnonBoxPseudo@@EA"]
@@ -15524,8 +15520,6 @@ cfg_if! {
             pub static nsCSSAnonBoxes_mozTreeCellText: *mut nsICSSAnonBoxPseudo;
             #[link_name = "\x01?mozTreeCheckbox@nsCSSAnonBoxes@@2PAVnsICSSAnonBoxPseudo@@A"]
             pub static nsCSSAnonBoxes_mozTreeCheckbox: *mut nsICSSAnonBoxPseudo;
-            #[link_name = "\x01?mozTreeProgressmeter@nsCSSAnonBoxes@@2PAVnsICSSAnonBoxPseudo@@A"]
-            pub static nsCSSAnonBoxes_mozTreeProgressmeter: *mut nsICSSAnonBoxPseudo;
             #[link_name = "\x01?mozTreeDropFeedback@nsCSSAnonBoxes@@2PAVnsICSSAnonBoxPseudo@@A"]
             pub static nsCSSAnonBoxes_mozTreeDropFeedback: *mut nsICSSAnonBoxPseudo;
             #[link_name = "\x01?mozSVGMarkerAnonChild@nsCSSAnonBoxes@@2PAVnsICSSAnonBoxPseudo@@A"]
@@ -20700,8 +20694,6 @@ macro_rules! atom {
   {{ #[allow(unsafe_code)] #[allow(unused_unsafe)]unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsCSSAnonBoxes_mozTreeCellText as *mut _) } }};
 (":-moz-tree-checkbox") =>
   {{ #[allow(unsafe_code)] #[allow(unused_unsafe)]unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsCSSAnonBoxes_mozTreeCheckbox as *mut _) } }};
-(":-moz-tree-progressmeter") =>
-  {{ #[allow(unsafe_code)] #[allow(unused_unsafe)]unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsCSSAnonBoxes_mozTreeProgressmeter as *mut _) } }};
 (":-moz-tree-drop-feedback") =>
   {{ #[allow(unsafe_code)] #[allow(unused_unsafe)]unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsCSSAnonBoxes_mozTreeDropFeedback as *mut _) } }};
 (":-moz-svg-marker-anon-child") =>

components/style/gecko/generated/pseudo_element_definition.rs

@@ -159,8 +159,6 @@ pub enum PseudoElement {
         MozTreeCellText(Box<[Atom]>),
         /// :-moz-tree-checkbox
         MozTreeCheckbox(Box<[Atom]>),
-        /// :-moz-tree-progressmeter
-        MozTreeProgressmeter(Box<[Atom]>),
         /// :-moz-tree-drop-feedback
         MozTreeDropFeedback(Box<[Atom]>),
         /// :-moz-svg-marker-anon-child
@@ -186,10 +184,10 @@ pub const EAGER_PSEUDO_COUNT: usize = 4;
 pub const SIMPLE_PSEUDO_COUNT: usize = 71;
 
 /// The number of tree pseudo-elements.
-pub const TREE_PSEUDO_COUNT: usize = 12;
+pub const TREE_PSEUDO_COUNT: usize = 11;
 
 /// The number of all pseudo-elements.
-pub const PSEUDO_COUNT: usize = 83;
+pub const PSEUDO_COUNT: usize = 82;
 
 /// The list of eager pseudos.
 pub const EAGER_PSEUDOS: [PseudoElement; EAGER_PSEUDO_COUNT] = [
@@ -283,7 +281,6 @@ impl PseudoElement {
                 PseudoElement::MozTreeImage(..) => atom!(":-moz-tree-image"),
                 PseudoElement::MozTreeCellText(..) => atom!(":-moz-tree-cell-text"),
                 PseudoElement::MozTreeCheckbox(..) => atom!(":-moz-tree-checkbox"),
-                PseudoElement::MozTreeProgressmeter(..) => atom!(":-moz-tree-progressmeter"),
                 PseudoElement::MozTreeDropFeedback(..) => atom!(":-moz-tree-drop-feedback"),
                 PseudoElement::MozSVGMarkerAnonChild => atom!(":-moz-svg-marker-anon-child"),
                 PseudoElement::MozSVGOuterSVGAnonChild => atom!(":-moz-svg-outer-svg-anon-child"),
@@ -373,12 +370,11 @@ impl PseudoElement {
             PseudoElement::MozTreeImage(..) => 74,
             PseudoElement::MozTreeCellText(..) => 75,
             PseudoElement::MozTreeCheckbox(..) => 76,
-            PseudoElement::MozTreeProgressmeter(..) => 77,
+            PseudoElement::MozTreeDropFeedback(..) => 77,
-            PseudoElement::MozTreeDropFeedback(..) => 78,
+            PseudoElement::MozSVGMarkerAnonChild => 78,
-            PseudoElement::MozSVGMarkerAnonChild => 79,
+            PseudoElement::MozSVGOuterSVGAnonChild => 79,
-            PseudoElement::MozSVGOuterSVGAnonChild => 80,
+            PseudoElement::MozSVGForeignContent => 80,
-            PseudoElement::MozSVGForeignContent => 81,
+            PseudoElement::MozSVGText => 81,
-            PseudoElement::MozSVGText => 82,
         }
     }
 
@@ -468,7 +464,6 @@ impl PseudoElement {
             None,
             None,
             None,
-            None,
             None
         ]
     }
@@ -529,7 +524,6 @@ impl PseudoElement {
                     PseudoElement::MozTreeImage(..) => true,
                     PseudoElement::MozTreeCellText(..) => true,
                     PseudoElement::MozTreeCheckbox(..) => true,
-                    PseudoElement::MozTreeProgressmeter(..) => true,
                     PseudoElement::MozTreeDropFeedback(..) => true,
                     PseudoElement::MozSVGMarkerAnonChild => true,
                     PseudoElement::MozSVGOuterSVGAnonChild => true,
@@ -560,7 +554,6 @@ impl PseudoElement {
             PseudoElement::MozTreeImage(..) => true,
             PseudoElement::MozTreeCellText(..) => true,
             PseudoElement::MozTreeCheckbox(..) => true,
-            PseudoElement::MozTreeProgressmeter(..) => true,
             PseudoElement::MozTreeDropFeedback(..) => true,
             _ => false,
         }
@@ -724,8 +717,6 @@ impl PseudoElement {
                     0,
                 PseudoElement::MozTreeCheckbox(..) =>
                     0,
-                PseudoElement::MozTreeProgressmeter(..) =>
-                    0,
                 PseudoElement::MozTreeDropFeedback(..) =>
                     0,
                 PseudoElement::MozSVGMarkerAnonChild =>
@@ -905,7 +896,6 @@ impl PseudoElement {
                     PseudoElement::MozTreeImage(..) => CSSPseudoElementType::XULTree,
                     PseudoElement::MozTreeCellText(..) => CSSPseudoElementType::XULTree,
                     PseudoElement::MozTreeCheckbox(..) => CSSPseudoElementType::XULTree,
-                    PseudoElement::MozTreeProgressmeter(..) => CSSPseudoElementType::XULTree,
                     PseudoElement::MozTreeDropFeedback(..) => CSSPseudoElementType::XULTree,
                     PseudoElement::MozSVGMarkerAnonChild => CSSPseudoElementType_InheritingAnonBox,
                     PseudoElement::MozSVGOuterSVGAnonChild => CSSPseudoElementType_InheritingAnonBox,
@@ -933,7 +923,6 @@ impl PseudoElement {
             PseudoElement::MozTreeImage(ref args) => Some(args),
             PseudoElement::MozTreeCellText(ref args) => Some(args),
             PseudoElement::MozTreeCheckbox(ref args) => Some(args),
-            PseudoElement::MozTreeProgressmeter(ref args) => Some(args),
             PseudoElement::MozTreeDropFeedback(ref args) => Some(args),
             _ => None,
         }
@@ -1153,7 +1142,6 @@ impl PseudoElement {
                 // We cannot generate PseudoElement::MozTreeImage(..) from just an atom.
                 // We cannot generate PseudoElement::MozTreeCellText(..) from just an atom.
                 // We cannot generate PseudoElement::MozTreeCheckbox(..) from just an atom.
-                // We cannot generate PseudoElement::MozTreeProgressmeter(..) from just an atom.
                 // We cannot generate PseudoElement::MozTreeDropFeedback(..) from just an atom.
                 if atom == &atom!(":-moz-svg-marker-anon-child") {
                     return Some(PseudoElement::MozSVGMarkerAnonChild);
@@ -1309,7 +1297,6 @@ impl PseudoElement {
                 // We cannot generate PseudoElement::MozTreeImage(..) from just an atom.
                 // We cannot generate PseudoElement::MozTreeCellText(..) from just an atom.
                 // We cannot generate PseudoElement::MozTreeCheckbox(..) from just an atom.
-                // We cannot generate PseudoElement::MozTreeProgressmeter(..) from just an atom.
                 // We cannot generate PseudoElement::MozTreeDropFeedback(..) from just an atom.
                 if atom == &atom!(":-moz-svg-marker-anon-child") {
                     return Some(PseudoElement::MozSVGMarkerAnonChild);
@@ -1359,9 +1346,6 @@ impl PseudoElement {
                 if atom == &atom!(":-moz-tree-checkbox") {
                     return Some(PseudoElement::MozTreeCheckbox(args));
                 }
-                if atom == &atom!(":-moz-tree-progressmeter") {
-                    return Some(PseudoElement::MozTreeProgressmeter(args));
-                }
                 if atom == &atom!(":-moz-tree-drop-feedback") {
                     return Some(PseudoElement::MozTreeDropFeedback(args));
                 }
@@ -1780,9 +1764,6 @@ impl PseudoElement {
             if tree_part.eq_ignore_ascii_case("checkbox") {
                 return Some(PseudoElement::MozTreeCheckbox(args));
             }
-            if tree_part.eq_ignore_ascii_case("progressmeter") {
-                return Some(PseudoElement::MozTreeProgressmeter(args));
-            }
             if tree_part.eq_ignore_ascii_case("drop-feedback") {
                 return Some(PseudoElement::MozTreeDropFeedback(args));
             }
@@ -1871,7 +1852,6 @@ impl ToCss for PseudoElement {
                 PseudoElement::MozTreeImage(..) => dest.write_str(":-moz-tree-image")?,
                 PseudoElement::MozTreeCellText(..) => dest.write_str(":-moz-tree-cell-text")?,
                 PseudoElement::MozTreeCheckbox(..) => dest.write_str(":-moz-tree-checkbox")?,
-                PseudoElement::MozTreeProgressmeter(..) => dest.write_str(":-moz-tree-progressmeter")?,
                 PseudoElement::MozTreeDropFeedback(..) => dest.write_str(":-moz-tree-drop-feedback")?,
                 PseudoElement::MozSVGMarkerAnonChild => dest.write_str(":-moz-svg-marker-anon-child")?,
                 PseudoElement::MozSVGOuterSVGAnonChild => dest.write_str(":-moz-svg-outer-svg-anon-child")?,