From 13016d22c57f787c78b644a87c58ae37c15af71a Mon Sep 17 00:00:00 2001
From: LingMan <18294-LingMan@users.noreply.gitlab.freedesktop.org>
Date: Tue, 27 Sep 2022 03:50:46 +0200
Subject: [PATCH] rusticl/bindgen: Use `allowlist-*` instead of `whitelist-*`
 switches

bindgen 0.58.0 deprecated the `whitelist-*` switches in favor of the new `allowlist-*` switches.
Currently rusticl uses a mixture of both.

Consistently move to the newer versions.

Reviewed-by: Karol Herbst <kherbst@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18834>
---
 src/gallium/frontends/rusticl/meson.build | 42 +++++++++++------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/gallium/frontends/rusticl/meson.build b/src/gallium/frontends/rusticl/meson.build
index 40ce07ad858..acd018c367f 100644
--- a/src/gallium/frontends/rusticl/meson.build
+++ b/src/gallium/frontends/rusticl/meson.build
@@ -134,8 +134,8 @@ rusticl_opencl_bindings_rs = rust.bindgen(
     '--ignore-functions',
     # needed because bindgen adds *mut void fields...
     '--raw-line', 'unsafe impl std::marker::Sync for _cl_icd_dispatch {}',
-    '--whitelist-type', 'cl_.*',
-    '--whitelist-var', 'CL_.*',
+    '--allowlist-type', 'cl_.*',
+    '--allowlist-var', 'CL_.*',
     # some info types need to be strongly typed so we can implement various get_infos
     '--new-type-alias-deref', 'cl_(mem|image|pipe)_info',
     '--new-type-alias-deref', 'cl_kernel_(arg|work_group)_info',
@@ -213,29 +213,29 @@ rusticl_mesa_bindings_rs = rust.bindgen(
   ],
   args : [
     rusticl_bindgen_args,
-    '--whitelist-function', 'blob_.*',
-    '--whitelist-function', 'clc_.*',
-    '--whitelist-function', 'disk_cache_.*',
-    '--whitelist-function', 'free',
-    '--whitelist-function', 'glsl_.*',
-    '--whitelist-function', 'malloc',
-    '--whitelist-function', 'mesa_.*',
-    '--whitelist-function', 'nir_.*',
-    '--whitelist-function', 'pipe_.*',
-    '--whitelist-function', 'rusticl_.*',
-    '--whitelist-function', 'rz?alloc_.*',
-    '--whitelist-function', 'spirv_.*',
-    '--whitelist-function', 'u_.*',
-    '--whitelist-function', 'util_format_.*',
-    '--whitelist-type', 'pipe_endian',
-    '--whitelist-type', 'clc_kernel_arg_access_qualifier',
+    '--allowlist-function', 'blob_.*',
+    '--allowlist-function', 'clc_.*',
+    '--allowlist-function', 'disk_cache_.*',
+    '--allowlist-function', 'free',
+    '--allowlist-function', 'glsl_.*',
+    '--allowlist-function', 'malloc',
+    '--allowlist-function', 'mesa_.*',
+    '--allowlist-function', 'nir_.*',
+    '--allowlist-function', 'pipe_.*',
+    '--allowlist-function', 'rusticl_.*',
+    '--allowlist-function', 'rz?alloc_.*',
+    '--allowlist-function', 'spirv_.*',
+    '--allowlist-function', 'u_.*',
+    '--allowlist-function', 'util_format_.*',
+    '--allowlist-type', 'pipe_endian',
+    '--allowlist-type', 'clc_kernel_arg_access_qualifier',
     '--bitfield-enum', 'clc_kernel_arg_access_qualifier',
-    '--whitelist-type', 'clc_kernel_arg_type_qualifier',
+    '--allowlist-type', 'clc_kernel_arg_type_qualifier',
     '--bitfield-enum', 'clc_kernel_arg_type_qualifier',
     '--bitfield-enum', 'nir_opt_if_options',
     '--bitfield-enum', 'nir_variable_mode',
-    '--whitelist-type', 'float_controls',
-    '--whitelist-var', 'PIPE_.*',
+    '--allowlist-type', 'float_controls',
+    '--allowlist-var', 'PIPE_.*',
     '--bitfield-enum', 'pipe_map_flags',
     '--allowlist-function', 'std(err|out)_ptr',
     '--bitfield-enum', 'nir_lower_int64_options',