From 3c6795b8906b224736c9eb914dd9bf50204f52c7 Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Wed, 4 Jan 2023 22:20:41 +0000 Subject: update for bindgen CLI change Bug: 264314481 Test: worksies Change-Id: I7bff88a76c6524f6d89ca9c671a385c5f36b5cc6 --- rust/minijail-sys/build.rs | 10 +++++----- rust/minijail-sys/lib.rs | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/rust/minijail-sys/build.rs b/rust/minijail-sys/build.rs index 8aa6651..4aa172d 100644 --- a/rust/minijail-sys/build.rs +++ b/rust/minijail-sys/build.rs @@ -85,15 +85,15 @@ fn bindings_generation() -> io::Result<()> { println!("cargo:rerun-if-changed={}", header_path.display()); let status = Command::new(&bindgen) .args(&["--default-enum-style", "rust"]) - .args(&["--blacklist-type", "__rlim64_t"]) + .args(&["--blocklist-type", "__rlim64_t"]) .args(&["--raw-line", "pub type __rlim64_t = u64;"]) - .args(&["--blacklist-type", "__u\\d{1,2}"]) + .args(&["--blocklist-type", "__u\\d{1,2}"]) .args(&["--raw-line", "pub type __u8 = u8;"]) .args(&["--raw-line", "pub type __u16 = u16;"]) .args(&["--raw-line", "pub type __u32 = u32;"]) - .args(&["--blacklist-type", "__uint64_t"]) - .args(&["--whitelist-function", "^minijail_.*"]) - .args(&["--whitelist-var", "^MINIJAIL_.*"]) + .args(&["--blocklist-type", "__uint64_t"]) + .args(&["--allowlist-function", "^minijail_.*"]) + .args(&["--allowlist-var", "^MINIJAIL_.*"]) .arg("--size_t-is-usize") .arg("--no-layout-tests") .arg("--disable-header-comment") diff --git a/rust/minijail-sys/lib.rs b/rust/minijail-sys/lib.rs index 3794c21..0285594 100644 --- a/rust/minijail-sys/lib.rs +++ b/rust/minijail-sys/lib.rs @@ -18,15 +18,15 @@ // // Generated in CrOS SDK chroot with: // bindgen --default-enum-style rust \ -// --blacklist-type '__rlim64_t' \ +// --blocklist-type '__rlim64_t' \ // --raw-line 'pub type __rlim64_t = u64;' \ -// --blacklist-type '__u\d{1,2}' \ +// --blocklist-type '__u\d{1,2}' \ // --raw-line 'pub type __u8 = u8;' \ // --raw-line 'pub type __u16 = u16;' \ // --raw-line 'pub type __u32 = u32;' \ -// --blacklist-type '__uint64_t' \ -// --whitelist-function '^minijail_.*' \ -// --whitelist-var '^MINIJAIL_.*' \ +// --blocklist-type '__uint64_t' \ +// --allowlist-function '^minijail_.*' \ +// --allowlist-var '^MINIJAIL_.*' \ // --no-layout-tests \ // --output libminijail.rs \ // libminijail.h -- \ -- cgit v1.2.3