From 8f7111b0f75d6111e2406b31a577c335fa5fdb3d Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@zed.dev>
Date: Thu, 24 Jun 2021 18:02:53 -0600
Subject: [PATCH] Upgrade bindgen to fix warnings on new Rust

---
 Cargo.lock      | 10 ++++++----
 gpui/Cargo.toml |  2 +-
 gpui/build.rs   |  6 +++---
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c5645c6f25..70a027a677 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,5 +1,7 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
+version = 3
+
 [[package]]
 name = "addr2line"
 version = "0.14.1"
@@ -221,9 +223,9 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
 
 [[package]]
 name = "bindgen"
-version = "0.57.0"
+version = "0.58.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd4865004a46a0aafb2a0a5eb19d3c9fc46ee5f063a6cfc605c69ac9ecf5263d"
+checksum = "0f8523b410d7187a43085e7e064416ea32ded16bd0a4e6fc025e21616d01258f"
 dependencies = [
  "bitflags 1.2.1",
  "cexpr",
@@ -2428,9 +2430,9 @@ checksum = "cc30b1e1e8c40c121ca33b86c23308a090d19974ef001b4bf6e61fd1a0fb095c"
 
 [[package]]
 name = "shlex"
-version = "0.1.1"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2"
+checksum = "42a568c8f2cd051a4d283bd6eb0343ac214c1b0f1ac19f93e1175b2dee38c73d"
 
 [[package]]
 name = "signal-hook"
diff --git a/gpui/Cargo.toml b/gpui/Cargo.toml
index 7f436094c9..4288795d92 100644
--- a/gpui/Cargo.toml
+++ b/gpui/Cargo.toml
@@ -30,7 +30,7 @@ tree-sitter = "0.19"
 usvg = "0.14"
 
 [build-dependencies]
-bindgen = "0.57"
+bindgen = "0.58.1"
 cc = "1.0.67"
 
 [dev-dependencies]
diff --git a/gpui/build.rs b/gpui/build.rs
index f8e885e919..a913f69a06 100644
--- a/gpui/build.rs
+++ b/gpui/build.rs
@@ -17,8 +17,8 @@ fn generate_dispatch_bindings() {
 
     let bindings = bindgen::Builder::default()
         .header("src/platform/mac/dispatch.h")
-        .whitelist_var("_dispatch_main_q")
-        .whitelist_function("dispatch_async_f")
+        .allowlist_var("_dispatch_main_q")
+        .allowlist_function("dispatch_async_f")
         .parse_callbacks(Box::new(bindgen::CargoCallbacks))
         .generate()
         .expect("unable to generate bindings");
@@ -94,7 +94,7 @@ fn compile_metal_shaders() {
 fn generate_shader_bindings() {
     let bindings = bindgen::Builder::default()
         .header(SHADER_HEADER_PATH)
-        .whitelist_type("GPUI.*")
+        .allowlist_type("GPUI.*")
         .parse_callbacks(Box::new(bindgen::CargoCallbacks))
         .generate()
         .expect("unable to generate bindings");