Skip to content

Commit 9d24066

Browse files
ojedafbq
authored andcommitted
rust: start supporting several bindgen versions
With both the workaround for `bindgen` 0.69.0 and the warning about 0.66.0 and 0.66.1 in place, start supporting several `bindgen` versions, like it was done for the Rust compiler in a previous patch. All other versions, including the latest 0.69.4, build without errors. The `bindgen` project, like Rust, has also agreed to have the kernel in their CI [1] -- thanks! This should help both projects: `bindgen` will be able to detect early issues like those mentioned above, and the kernel will be very likely build with new releases (at least for the basic configuration being tested). Link: rust-lang/rust-bindgen#2851 [1] Signed-off-by: Miguel Ojeda <ojeda@kernel.org> Link: https://lore.kernel.org/r/20240701183625.665574-11-ojeda@kernel.org
1 parent 0700048 commit 9d24066

File tree

3 files changed

+3
-15
lines changed

3 files changed

+3
-15
lines changed

Documentation/rust/quick-start.rst

+3-2
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,10 @@ bindgen
107107
*******
108108

109109
The bindings to the C side of the kernel are generated at build time using
110-
the ``bindgen`` tool. A particular version is required.
110+
the ``bindgen`` tool.
111111

112-
Install it via (note that this will download and build the tool from source)::
112+
Install it, for instance, via (note that this will download and build the tool
113+
from source)::
113114

114115
cargo install --locked --version $(scripts/min-tool-version.sh bindgen) bindgen-cli
115116

scripts/rust_is_available.sh

-8
Original file line numberDiff line numberDiff line change
@@ -161,14 +161,6 @@ if [ "$rust_bindings_generator_cversion" -lt "$rust_bindings_generator_min_cvers
161161
echo >&2 "***"
162162
exit 1
163163
fi
164-
if [ "$rust_bindings_generator_cversion" -gt "$rust_bindings_generator_min_cversion" ]; then
165-
echo >&2 "***"
166-
echo >&2 "*** Rust bindings generator '$BINDGEN' is too new. This may or may not work."
167-
echo >&2 "*** Your version: $rust_bindings_generator_version"
168-
echo >&2 "*** Expected version: $rust_bindings_generator_min_version"
169-
echo >&2 "***"
170-
warning=1
171-
fi
172164
if [ "$rust_bindings_generator_cversion" -eq 6600 ] || [ "$rust_bindings_generator_cversion" -eq 6601 ]; then
173165
echo >&2 "***"
174166
echo >&2 "*** Rust bindings generator '$BINDGEN' versions 0.66.0 and 0.66.1 may not"

scripts/rust_is_available_test.py

-5
Original file line numberDiff line numberDiff line change
@@ -231,11 +231,6 @@ def test_bindgen_old_version(self):
231231
result = self.run_script(self.Expected.FAILURE, { "BINDGEN": bindgen })
232232
self.assertIn(f"Rust bindings generator '{bindgen}' is too old.", result.stderr)
233233

234-
def test_bindgen_new_version(self):
235-
bindgen = self.generate_bindgen_version("bindgen 0.999.0")
236-
result = self.run_script(self.Expected.SUCCESS_WITH_WARNINGS, { "BINDGEN": bindgen })
237-
self.assertIn(f"Rust bindings generator '{bindgen}' is too new. This may or may not work.", result.stderr)
238-
239234
def test_bindgen_bad_version_0_66_0_and_0_66_1(self):
240235
for version in ("0.66.0", "0.66.1"):
241236
with self.subTest(version=version):

0 commit comments

Comments
 (0)