From: Miguel Ojeda <ojeda@kernel.org>
To: "Miguel Ojeda" <ojeda@kernel.org>,
"Nathan Chancellor" <nathan@kernel.org>,
"Nicolas Schier" <nsc@kernel.org>,
"Danilo Krummrich" <dakr@kernel.org>,
"Andreas Hindborg" <a.hindborg@kernel.org>,
"Catalin Marinas" <catalin.marinas@arm.com>,
"Will Deacon" <will@kernel.org>, "Paul Walmsley" <pjw@kernel.org>,
"Palmer Dabbelt" <palmer@dabbelt.com>,
"Albert Ou" <aou@eecs.berkeley.edu>,
"Alexandre Courbot" <acourbot@nvidia.com>,
"David Airlie" <airlied@gmail.com>,
"Simona Vetter" <simona@ffwll.ch>,
"Brendan Higgins" <brendan.higgins@linux.dev>,
"David Gow" <david@davidgow.net>,
"Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
"Arve Hjønnevåg" <arve@android.com>,
"Todd Kjos" <tkjos@android.com>,
"Christian Brauner" <christian@brauner.io>,
"Carlos Llamas" <cmllamas@google.com>,
"Alice Ryhl" <aliceryhl@google.com>,
"Jonathan Corbet" <corbet@lwn.net>
Cc: "Boqun Feng" <boqun@kernel.org>, "Gary Guo" <gary@garyguo.net>,
"Björn Roy Baron" <bjorn3_gh@protonmail.com>,
"Benno Lossin" <lossin@kernel.org>,
"Trevor Gross" <tmgross@umich.edu>,
rust-for-linux@vger.kernel.org, linux-kbuild@vger.kernel.org,
"Lorenzo Stoakes" <lorenzo.stoakes@oracle.com>,
"Vlastimil Babka" <vbabka@kernel.org>,
"Liam R . Howlett" <Liam.Howlett@oracle.com>,
"Uladzislau Rezki" <urezki@gmail.com>,
linux-block@vger.kernel.org,
linux-arm-kernel@lists.infradead.org (moderated for
non-subscribers), "Alexandre Ghiti" <alex@ghiti.fr>,
linux-riscv@lists.infradead.org, nouveau@lists.freedesktop.org,
dri-devel@lists.freedesktop.org, "Rae Moar" <raemoar63@gmail.com>,
linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com,
"Nick Desaulniers" <nick.desaulniers+lkml@gmail.com>,
"Bill Wendling" <morbo@google.com>,
"Justin Stitt" <justinstitt@google.com>,
llvm@lists.linux.dev, linux-kernel@vger.kernel.org,
"Shuah Khan" <skhan@linuxfoundation.org>,
linux-doc@vger.kernel.org
Subject: [PATCH 15/33] rust: rust_is_available: remove warning for 0.66.[01] buggy versions
Date: Wed, 1 Apr 2026 13:45:22 +0200 [thread overview]
Message-ID: <20260401114540.30108-16-ojeda@kernel.org> (raw)
In-Reply-To: <20260401114540.30108-1-ojeda@kernel.org>
It is not possible anymore to fall into the issue that this warning was
alerting about given the `bindgen` version bump.
Thus simplify by removing the machinery behind it, including tests.
Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
---
scripts/rust_is_available.sh | 13 ------------
scripts/rust_is_available_bindgen_0_66.h | 2 --
scripts/rust_is_available_test.py | 26 +++---------------------
3 files changed, 3 insertions(+), 38 deletions(-)
delete mode 100644 scripts/rust_is_available_bindgen_0_66.h
diff --git a/scripts/rust_is_available.sh b/scripts/rust_is_available.sh
index d2323de0692c..77896e31dab5 100755
--- a/scripts/rust_is_available.sh
+++ b/scripts/rust_is_available.sh
@@ -163,19 +163,6 @@ if [ "$rust_bindings_generator_cversion" -lt "$rust_bindings_generator_min_cvers
echo >&2 "***"
exit 1
fi
-if [ "$rust_bindings_generator_cversion" -eq 6600 ] ||
- [ "$rust_bindings_generator_cversion" -eq 6601 ]; then
- # Distributions may have patched the issue (e.g. Debian did).
- if ! "$BINDGEN" $(dirname $0)/rust_is_available_bindgen_0_66.h >/dev/null; then
- echo >&2 "***"
- echo >&2 "*** Rust bindings generator '$BINDGEN' versions 0.66.0 and 0.66.1 may not"
- echo >&2 "*** work due to a bug (https://github.com/rust-lang/rust-bindgen/pull/2567),"
- echo >&2 "*** unless patched (like Debian's)."
- echo >&2 "*** Your version: $rust_bindings_generator_version"
- echo >&2 "***"
- warning=1
- fi
-fi
# Check that the `libclang` used by the Rust bindings generator is suitable.
#
diff --git a/scripts/rust_is_available_bindgen_0_66.h b/scripts/rust_is_available_bindgen_0_66.h
deleted file mode 100644
index c0431293421c..000000000000
--- a/scripts/rust_is_available_bindgen_0_66.h
+++ /dev/null
@@ -1,2 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#define A "\0"
diff --git a/scripts/rust_is_available_test.py b/scripts/rust_is_available_test.py
index 4fcc319dea84..b66fa5933844 100755
--- a/scripts/rust_is_available_test.py
+++ b/scripts/rust_is_available_test.py
@@ -54,17 +54,12 @@ else:
""")
@classmethod
- def generate_bindgen(cls, version_stdout, libclang_stderr, version_0_66_patched=False, libclang_concat_patched=False):
+ def generate_bindgen(cls, version_stdout, libclang_stderr, libclang_concat_patched=False):
if libclang_stderr is None:
libclang_case = f"raise SystemExit({cls.bindgen_default_bindgen_libclang_failure_exit_code})"
else:
libclang_case = f"print({repr(libclang_stderr)}, file=sys.stderr)"
- if version_0_66_patched:
- version_0_66_case = "pass"
- else:
- version_0_66_case = "raise SystemExit(1)"
-
if libclang_concat_patched:
libclang_concat_case = "print('pub static mut foofoo: ::std::os::raw::c_int;')"
else:
@@ -74,8 +69,6 @@ else:
import sys
if "rust_is_available_bindgen_libclang.h" in " ".join(sys.argv):
{libclang_case}
-elif "rust_is_available_bindgen_0_66.h" in " ".join(sys.argv):
- {version_0_66_case}
elif "rust_is_available_bindgen_libclang_concat.h" in " ".join(sys.argv):
{libclang_concat_case}
else:
@@ -83,8 +76,8 @@ else:
""")
@classmethod
- def generate_bindgen_version(cls, stdout, version_0_66_patched=False):
- return cls.generate_bindgen(stdout, cls.bindgen_default_bindgen_libclang_stderr, version_0_66_patched)
+ def generate_bindgen_version(cls, stdout):
+ return cls.generate_bindgen(stdout, cls.bindgen_default_bindgen_libclang_stderr)
@classmethod
def generate_bindgen_libclang_failure(cls):
@@ -245,19 +238,6 @@ else:
result = self.run_script(self.Expected.FAILURE, { "BINDGEN": bindgen })
self.assertIn(f"Rust bindings generator '{bindgen}' is too old.", result.stderr)
- def test_bindgen_bad_version_0_66_0_and_0_66_1(self):
- for version in ("0.66.0", "0.66.1"):
- with self.subTest(version=version):
- bindgen = self.generate_bindgen_version(f"bindgen {version}")
- result = self.run_script(self.Expected.SUCCESS_WITH_WARNINGS, { "BINDGEN": bindgen })
- self.assertIn(f"Rust bindings generator '{bindgen}' versions 0.66.0 and 0.66.1 may not", result.stderr)
-
- def test_bindgen_bad_version_0_66_0_and_0_66_1_patched(self):
- for version in ("0.66.0", "0.66.1"):
- with self.subTest(version=version):
- bindgen = self.generate_bindgen_version(f"bindgen {version}", True)
- result = self.run_script(self.Expected.SUCCESS, { "BINDGEN": bindgen })
-
def test_bindgen_libclang_failure(self):
bindgen = self.generate_bindgen_libclang_failure()
result = self.run_script(self.Expected.FAILURE, { "BINDGEN": bindgen })
--
2.53.0
next prev parent reply other threads:[~2026-04-01 11:49 UTC|newest]
Thread overview: 107+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-04-01 11:45 [PATCH 00/33] rust: bump minimum Rust and `bindgen` versions Miguel Ojeda
2026-04-01 11:45 ` [PATCH 01/33] rust: bump Rust minimum supported version to 1.85.0 (Debian Trixie) Miguel Ojeda
2026-04-01 12:24 ` Alice Ryhl
2026-04-01 12:28 ` Danilo Krummrich
2026-04-01 13:11 ` Gary Guo
2026-04-01 13:28 ` Gary Guo
2026-04-01 13:31 ` Miguel Ojeda
2026-04-01 14:57 ` Benno Lossin
2026-04-01 22:59 ` Tamir Duberstein
2026-04-01 11:45 ` [PATCH 02/33] rust: bump Clippy's MSRV and clean `incompatible_msrv` allows Miguel Ojeda
2026-04-01 13:15 ` Gary Guo
2026-04-01 15:39 ` Danilo Krummrich
2026-04-01 22:59 ` Tamir Duberstein
2026-04-01 11:45 ` [PATCH 03/33] rust: simplify `RUSTC_VERSION` Kconfig conditions Miguel Ojeda
2026-04-01 13:18 ` Gary Guo
2026-04-01 22:59 ` Tamir Duberstein
2026-04-01 11:45 ` [PATCH 04/33] rust: remove `RUSTC_HAS_SLICE_AS_FLATTENED` and simplify code Miguel Ojeda
2026-04-01 13:18 ` Gary Guo
2026-04-01 22:59 ` Tamir Duberstein
2026-04-01 11:45 ` [PATCH 05/33] rust: remove `RUSTC_HAS_COERCE_POINTEE` " Miguel Ojeda
2026-04-01 13:44 ` Gary Guo
2026-04-01 15:38 ` Danilo Krummrich
2026-04-01 22:59 ` Tamir Duberstein
2026-04-01 11:45 ` [PATCH 06/33] rust: kbuild: remove skipping of `-Wrustdoc::unescaped_backticks` Miguel Ojeda
2026-04-01 13:44 ` Gary Guo
2026-04-01 22:59 ` Tamir Duberstein
2026-04-01 11:45 ` [PATCH 07/33] rust: kbuild: remove `feature(...)`s that are now stable Miguel Ojeda
2026-04-01 13:51 ` Gary Guo
2026-04-01 22:59 ` Tamir Duberstein
2026-04-01 11:45 ` [PATCH 08/33] rust: kbuild: simplify `--remap-path-prefix` workaround Miguel Ojeda
2026-04-01 13:59 ` Gary Guo
2026-04-01 17:36 ` Miguel Ojeda
2026-04-01 22:59 ` Tamir Duberstein
2026-04-01 11:45 ` [PATCH 09/33] rust: kbuild: make `--remap-path-prefix` workaround conditional Miguel Ojeda
2026-04-01 14:08 ` Gary Guo
2026-04-01 17:39 ` Miguel Ojeda
2026-04-01 22:59 ` Tamir Duberstein
2026-04-01 11:45 ` [PATCH 10/33] rust: transmute: simplify code with Rust 1.80.0 `split_at_*checked()` Miguel Ojeda
2026-04-01 14:10 ` Gary Guo
2026-04-01 22:59 ` Tamir Duberstein
2026-04-01 11:45 ` [PATCH 11/33] rust: alloc: simplify with `NonNull::add()` now that it is stable Miguel Ojeda
2026-04-01 12:28 ` Danilo Krummrich
2026-04-01 14:12 ` Gary Guo
2026-04-01 22:59 ` Tamir Duberstein
2026-04-01 11:45 ` [PATCH 12/33] rust: macros: update `extract_if` MSRV TODO comment Miguel Ojeda
2026-04-01 14:18 ` Gary Guo
2026-04-01 17:45 ` Miguel Ojeda
2026-04-01 22:59 ` Tamir Duberstein
2026-04-01 11:45 ` [PATCH 13/33] rust: block: update `const_refs_to_static` " Miguel Ojeda
2026-04-01 14:37 ` Gary Guo
2026-04-01 22:59 ` Tamir Duberstein
2026-04-01 11:45 ` [PATCH 14/33] rust: bump `bindgen` minimum supported version to 0.71.1 (Debian Trixie) Miguel Ojeda
2026-04-01 14:38 ` Gary Guo
2026-04-01 22:59 ` Tamir Duberstein
2026-04-01 11:45 ` Miguel Ojeda [this message]
2026-04-01 14:58 ` [PATCH 15/33] rust: rust_is_available: remove warning for 0.66.[01] buggy versions Gary Guo
2026-04-02 7:12 ` Miguel Ojeda
2026-04-01 22:59 ` Tamir Duberstein
2026-04-01 11:45 ` [PATCH 16/33] rust: rust_is_available: remove warning for < 0.69.5 && libclang >= 19.1 Miguel Ojeda
2026-04-01 22:59 ` Tamir Duberstein
2026-04-01 11:45 ` [PATCH 17/33] rust: kbuild: update `bindgen --rust-target` version and replace comment Miguel Ojeda
2026-04-01 15:05 ` Gary Guo
2026-04-01 22:59 ` Tamir Duberstein
2026-04-01 11:45 ` [PATCH 18/33] rust: kbuild: remove "dummy parameter" workaround for `bindgen` < 0.71.1 Miguel Ojeda
2026-04-01 15:05 ` Gary Guo
2026-04-01 22:59 ` Tamir Duberstein
2026-04-01 11:45 ` [PATCH 19/33] rust: kbuild: remove "`try` keyword" workaround for `bindgen` < 0.59.2 Miguel Ojeda
2026-04-01 15:05 ` Gary Guo
2026-04-01 22:59 ` Tamir Duberstein
2026-04-01 11:45 ` [PATCH 20/33] rust: kbuild: remove unneeded old `allow`s for generated layout tests Miguel Ojeda
2026-04-01 15:05 ` Gary Guo
2026-04-01 22:59 ` Tamir Duberstein
2026-04-01 11:45 ` [PATCH 21/33] gpu: nova-core: bindings: remove unneeded `cfg_attr` Miguel Ojeda
2026-04-01 12:29 ` Danilo Krummrich
2026-04-01 15:08 ` Gary Guo
2026-04-01 22:59 ` Tamir Duberstein
2026-04-01 11:45 ` [PATCH 22/33] docs: rust: quick-start: openSUSE provides `rust-src` package nowadays Miguel Ojeda
2026-04-01 22:59 ` Tamir Duberstein
2026-04-01 11:45 ` [PATCH 23/33] docs: rust: quick-start: update Ubuntu versioned packages Miguel Ojeda
2026-04-01 22:59 ` Tamir Duberstein
2026-04-01 11:45 ` [PATCH 24/33] docs: rust: quick-start: update minimum Ubuntu version Miguel Ojeda
2026-04-01 22:59 ` Tamir Duberstein
2026-04-01 11:45 ` [PATCH 25/33] docs: rust: quick-start: add Ubuntu 26.04 LTS and remove subsection title Miguel Ojeda
2026-04-01 22:59 ` Tamir Duberstein
2026-04-01 11:45 ` [PATCH 26/33] docs: rust: quick-start: remove Gentoo "testing" note Miguel Ojeda
2026-04-01 22:59 ` Tamir Duberstein
2026-04-01 11:45 ` [PATCH 27/33] docs: rust: quick-start: remove Nix "unstable channel" note Miguel Ojeda
2026-04-01 15:10 ` Gary Guo
2026-04-01 22:59 ` Tamir Duberstein
2026-04-01 11:45 ` [PATCH 28/33] docs: rust: quick-start: remove GDB/Binutils mention Miguel Ojeda
2026-04-01 15:15 ` Gary Guo
2026-04-01 22:59 ` Tamir Duberstein
2026-04-01 11:45 ` [PATCH 29/33] docs: rust: general-information: simplify Kconfig example Miguel Ojeda
2026-04-01 15:16 ` Gary Guo
2026-04-01 22:59 ` Tamir Duberstein
2026-04-01 11:45 ` [PATCH 30/33] docs: rust: general-information: use real example Miguel Ojeda
2026-04-01 15:16 ` Gary Guo
2026-04-01 22:59 ` Tamir Duberstein
2026-04-01 11:45 ` [PATCH 31/33] rust: declare cfi_encoding for lru_status Miguel Ojeda
2026-04-01 15:20 ` Gary Guo
2026-04-01 11:45 ` [PATCH 32/33] rust: kbuild: support global per-version flags Miguel Ojeda
2026-04-01 15:26 ` Gary Guo
2026-04-05 23:15 ` Miguel Ojeda
2026-04-01 22:59 ` Tamir Duberstein
2026-04-01 11:45 ` [PATCH 33/33] rust: kbuild: allow `clippy::precedence` for Rust < 1.86.0 Miguel Ojeda
2026-04-01 15:28 ` Gary Guo
2026-04-01 22:59 ` Tamir Duberstein
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260401114540.30108-16-ojeda@kernel.org \
--to=ojeda@kernel.org \
--cc=Liam.Howlett@oracle.com \
--cc=a.hindborg@kernel.org \
--cc=acourbot@nvidia.com \
--cc=airlied@gmail.com \
--cc=alex@ghiti.fr \
--cc=aliceryhl@google.com \
--cc=aou@eecs.berkeley.edu \
--cc=arve@android.com \
--cc=bjorn3_gh@protonmail.com \
--cc=boqun@kernel.org \
--cc=brendan.higgins@linux.dev \
--cc=catalin.marinas@arm.com \
--cc=christian@brauner.io \
--cc=cmllamas@google.com \
--cc=corbet@lwn.net \
--cc=dakr@kernel.org \
--cc=david@davidgow.net \
--cc=dri-devel@lists.freedesktop.org \
--cc=gary@garyguo.net \
--cc=gregkh@linuxfoundation.org \
--cc=justinstitt@google.com \
--cc=kunit-dev@googlegroups.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=llvm@lists.linux.dev \
--cc=lorenzo.stoakes@oracle.com \
--cc=lossin@kernel.org \
--cc=morbo@google.com \
--cc=nathan@kernel.org \
--cc=nick.desaulniers+lkml@gmail.com \
--cc=nouveau@lists.freedesktop.org \
--cc=nsc@kernel.org \
--cc=palmer@dabbelt.com \
--cc=pjw@kernel.org \
--cc=raemoar63@gmail.com \
--cc=rust-for-linux@vger.kernel.org \
--cc=simona@ffwll.ch \
--cc=skhan@linuxfoundation.org \
--cc=tkjos@android.com \
--cc=tmgross@umich.edu \
--cc=urezki@gmail.com \
--cc=vbabka@kernel.org \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox