diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2026-05-09 11:24:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2026-05-09 11:24:02 -0700 |
| commit | e92b2872d0b198a77c0a438c5cdb1c5510762c1b (patch) | |
| tree | 17726ad1d02f6644898721e90bcbffbd85e953aa /Makefile | |
| parent | ec89572766744e844df24c27d31c97b4c00f4e07 (diff) | |
| parent | 2adc8664018c1cc595c7c0c98474a33c7fe32a85 (diff) | |
| download | linux-next-history-e92b2872d0b198a77c0a438c5cdb1c5510762c1b.tar.gz | |
Merge tag 'rust-fixes-7.1' of git://git.kernel.org/pub/scm/linux/kernel/git/ojeda/linux
Pull Rust fixes from Miguel Ojeda:
"Toolchain and infrastructure:
- Add 'bindgen' target to make UML 32-bit builds work with GCC
- Disable two Clippy warnings ('collapsible_{if,match}')
'pin-init' crate:
- Fix unsoundness issue that created &'static references"
* tag 'rust-fixes-7.1' of git://git.kernel.org/pub/scm/linux/kernel/git/ojeda/linux:
rust: allow `clippy::collapsible_if` globally
rust: allow `clippy::collapsible_match` globally
rust: pin-init: fix incorrect accessor reference lifetime
rust: pin-init: internal: move alignment check to `make_field_check`
rust: arch: um: Fix building 32-bit UML with GCC
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile b/Makefile index 9f88dcaae3827..93eded47ccd2e 100644 --- a/Makefile +++ b/Makefile @@ -486,6 +486,8 @@ export rust_common_flags := --edition=2021 \ -Wclippy::as_ptr_cast_mut \ -Wclippy::as_underscore \ -Wclippy::cast_lossless \ + -Aclippy::collapsible_if \ + -Aclippy::collapsible_match \ -Wclippy::ignored_unit_patterns \ -Aclippy::incompatible_msrv \ -Wclippy::mut_mut \ |