Skip to content

Commit 0e1329d

Browse files
torvaldstorvalds
committed
Merge tag 'rust-fixes-6.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/ojeda/linux
Pull rust fixes from Miguel Ojeda: - Make CFI_AUTO_DEFAULT depend on !RUST or Rust >= 1.88.0 - Clean Rust (and Clippy) lints for the upcoming Rust 1.87.0 and 1.88.0 releases - Clean objtool warning for the upcoming Rust 1.87.0 release by adding one more noreturn function * tag 'rust-fixes-6.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/ojeda/linux: x86/Kconfig: make CFI_AUTO_DEFAULT depend on !RUST or Rust >= 1.88 rust: clean Rust 1.88.0's `clippy::uninlined_format_args` lint rust: clean Rust 1.88.0's warning about `clippy::disallowed_macros` configuration rust: clean Rust 1.88.0's `unnecessary_transmutes` lint rust: allow Rust 1.87.0's `clippy::ptr_eq` lint objtool/rust: add one more `noreturn` Rust function for Rust 1.87.0
2 parents ea34704 + 5595c31 commit 0e1329d

File tree

14 files changed

+49
-51
lines changed

14 files changed

+49
-51
lines changed

‎.clippy.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ check-private-items = true
77
disallowed-macros = [
88
# The `clippy::dbg_macro` lint only works with `std::dbg!`, thus we simulate
99
# it here, see: https://github.com/rust-lang/rust-clippy/issues/11303.
10-
{ path = "kernel::dbg", reason = "the `dbg!` macro is intended as a debugging tool" },
10+
{ path = "kernel::dbg", reason = "the `dbg!` macro is intended as a debugging tool", allow-invalid = true },
1111
]

‎arch/x86/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2368,6 +2368,7 @@ config STRICT_SIGALTSTACK_SIZE
23682368
config CFI_AUTO_DEFAULT
23692369
bool "Attempt to use FineIBT by default at boot time"
23702370
depends on FINEIBT
2371+
depends on !RUST || RUSTC_VERSION >= 108800
23712372
default y
23722373
help
23732374
Attempt to use FineIBT by default at boot time. If enabled,

‎drivers/gpu/nova-core/gpu.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ impl Chipset {
9393
// For now, redirect to fmt::Debug for convenience.
9494
impl fmt::Display for Chipset {
9595
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
96-
write!(f, "{:?}", self)
96+
write!(f, "{self:?}")
9797
}
9898
}
9999

‎init/Kconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,9 @@ config LD_CAN_USE_KEEP_IN_OVERLAY
140140
config RUSTC_HAS_COERCE_POINTEE
141141
def_bool RUSTC_VERSION >= 108400
142142

143+
config RUSTC_HAS_UNNECESSARY_TRANSMUTES
144+
def_bool RUSTC_VERSION >= 108800
145+
143146
config PAHOLE_VERSION
144147
int
145148
default $(shell,$(srctree)/scripts/pahole-version.sh $(PAHOLE))

‎rust/bindings/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626

2727
#[allow(dead_code)]
2828
#[allow(clippy::undocumented_unsafe_blocks)]
29+
#[cfg_attr(CONFIG_RUSTC_HAS_UNNECESSARY_TRANSMUTES, allow(unnecessary_transmutes))]
2930
mod bindings_raw {
3031
// Manual definition for blocklisted types.
3132
type __kernel_size_t = usize;

‎rust/kernel/alloc/kvec.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
//! Implementation of [`Vec`].
44
5+
// May not be needed in Rust 1.87.0 (pending beta backport).
6+
#![allow(clippy::ptr_eq)]
7+
58
use super::{
69
allocator::{KVmalloc, Kmalloc, Vmalloc},
710
layout::ArrayLayout,

‎rust/kernel/list.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44

55
//! A linked list implementation.
66
7+
// May not be needed in Rust 1.87.0 (pending beta backport).
8+
#![allow(clippy::ptr_eq)]
9+
710
use crate::sync::ArcBorrow;
811
use crate::types::Opaque;
912
use core::iter::{DoubleEndedIterator, FusedIterator};

‎rust/kernel/str.rs

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ impl fmt::Display for BStr {
7373
b'\r' => f.write_str("\\r")?,
7474
// Printable characters.
7575
0x20..=0x7e => f.write_char(b as char)?,
76-
_ => write!(f, "\\x{:02x}", b)?,
76+
_ => write!(f, "\\x{b:02x}")?,
7777
}
7878
}
7979
Ok(())
@@ -109,7 +109,7 @@ impl fmt::Debug for BStr {
109109
b'\\' => f.write_str("\\\\")?,
110110
// Printable characters.
111111
0x20..=0x7e => f.write_char(b as char)?,
112-
_ => write!(f, "\\x{:02x}", b)?,
112+
_ => write!(f, "\\x{b:02x}")?,
113113
}
114114
}
115115
f.write_char('"')
@@ -447,7 +447,7 @@ impl fmt::Display for CStr {
447447
// Printable character.
448448
f.write_char(c as char)?;
449449
} else {
450-
write!(f, "\\x{:02x}", c)?;
450+
write!(f, "\\x{c:02x}")?;
451451
}
452452
}
453453
Ok(())
@@ -479,7 +479,7 @@ impl fmt::Debug for CStr {
479479
// Printable characters.
480480
b'\"' => f.write_str("\\\"")?,
481481
0x20..=0x7e => f.write_char(c as char)?,
482-
_ => write!(f, "\\x{:02x}", c)?,
482+
_ => write!(f, "\\x{c:02x}")?,
483483
}
484484
}
485485
f.write_str("\"")
@@ -641,13 +641,13 @@ mod tests {
641641
#[test]
642642
fn test_cstr_display() {
643643
let hello_world = CStr::from_bytes_with_nul(b"hello, world!\0").unwrap();
644-
assert_eq!(format!("{}", hello_world), "hello, world!");
644+
assert_eq!(format!("{hello_world}"), "hello, world!");
645645
let non_printables = CStr::from_bytes_with_nul(b"\x01\x09\x0a\0").unwrap();
646-
assert_eq!(format!("{}", non_printables), "\\x01\\x09\\x0a");
646+
assert_eq!(format!("{non_printables}"), "\\x01\\x09\\x0a");
647647
let non_ascii = CStr::from_bytes_with_nul(b"d\xe9j\xe0 vu\0").unwrap();
648-
assert_eq!(format!("{}", non_ascii), "d\\xe9j\\xe0 vu");
648+
assert_eq!(format!("{non_ascii}"), "d\\xe9j\\xe0 vu");
649649
let good_bytes = CStr::from_bytes_with_nul(b"\xf0\x9f\xa6\x80\0").unwrap();
650-
assert_eq!(format!("{}", good_bytes), "\\xf0\\x9f\\xa6\\x80");
650+
assert_eq!(format!("{good_bytes}"), "\\xf0\\x9f\\xa6\\x80");
651651
}
652652

653653
#[test]
@@ -658,47 +658,47 @@ mod tests {
658658
bytes[i as usize] = i.wrapping_add(1);
659659
}
660660
let cstr = CStr::from_bytes_with_nul(&bytes).unwrap();
661-
assert_eq!(format!("{}", cstr), ALL_ASCII_CHARS);
661+
assert_eq!(format!("{cstr}"), ALL_ASCII_CHARS);
662662
}
663663

664664
#[test]
665665
fn test_cstr_debug() {
666666
let hello_world = CStr::from_bytes_with_nul(b"hello, world!\0").unwrap();
667-
assert_eq!(format!("{:?}", hello_world), "\"hello, world!\"");
667+
assert_eq!(format!("{hello_world:?}"), "\"hello, world!\"");
668668
let non_printables = CStr::from_bytes_with_nul(b"\x01\x09\x0a\0").unwrap();
669-
assert_eq!(format!("{:?}", non_printables), "\"\\x01\\x09\\x0a\"");
669+
assert_eq!(format!("{non_printables:?}"), "\"\\x01\\x09\\x0a\"");
670670
let non_ascii = CStr::from_bytes_with_nul(b"d\xe9j\xe0 vu\0").unwrap();
671-
assert_eq!(format!("{:?}", non_ascii), "\"d\\xe9j\\xe0 vu\"");
671+
assert_eq!(format!("{non_ascii:?}"), "\"d\\xe9j\\xe0 vu\"");
672672
let good_bytes = CStr::from_bytes_with_nul(b"\xf0\x9f\xa6\x80\0").unwrap();
673-
assert_eq!(format!("{:?}", good_bytes), "\"\\xf0\\x9f\\xa6\\x80\"");
673+
assert_eq!(format!("{good_bytes:?}"), "\"\\xf0\\x9f\\xa6\\x80\"");
674674
}
675675

676676
#[test]
677677
fn test_bstr_display() {
678678
let hello_world = BStr::from_bytes(b"hello, world!");
679-
assert_eq!(format!("{}", hello_world), "hello, world!");
679+
assert_eq!(format!("{hello_world}"), "hello, world!");
680680
let escapes = BStr::from_bytes(b"_\t_\n_\r_\\_\'_\"_");
681-
assert_eq!(format!("{}", escapes), "_\\t_\\n_\\r_\\_'_\"_");
681+
assert_eq!(format!("{escapes}"), "_\\t_\\n_\\r_\\_'_\"_");
682682
let others = BStr::from_bytes(b"\x01");
683-
assert_eq!(format!("{}", others), "\\x01");
683+
assert_eq!(format!("{others}"), "\\x01");
684684
let non_ascii = BStr::from_bytes(b"d\xe9j\xe0 vu");
685-
assert_eq!(format!("{}", non_ascii), "d\\xe9j\\xe0 vu");
685+
assert_eq!(format!("{non_ascii}"), "d\\xe9j\\xe0 vu");
686686
let good_bytes = BStr::from_bytes(b"\xf0\x9f\xa6\x80");
687-
assert_eq!(format!("{}", good_bytes), "\\xf0\\x9f\\xa6\\x80");
687+
assert_eq!(format!("{good_bytes}"), "\\xf0\\x9f\\xa6\\x80");
688688
}
689689

690690
#[test]
691691
fn test_bstr_debug() {
692692
let hello_world = BStr::from_bytes(b"hello, world!");
693-
assert_eq!(format!("{:?}", hello_world), "\"hello, world!\"");
693+
assert_eq!(format!("{hello_world:?}"), "\"hello, world!\"");
694694
let escapes = BStr::from_bytes(b"_\t_\n_\r_\\_\'_\"_");
695-
assert_eq!(format!("{:?}", escapes), "\"_\\t_\\n_\\r_\\\\_'_\\\"_\"");
695+
assert_eq!(format!("{escapes:?}"), "\"_\\t_\\n_\\r_\\\\_'_\\\"_\"");
696696
let others = BStr::from_bytes(b"\x01");
697-
assert_eq!(format!("{:?}", others), "\"\\x01\"");
697+
assert_eq!(format!("{others:?}"), "\"\\x01\"");
698698
let non_ascii = BStr::from_bytes(b"d\xe9j\xe0 vu");
699-
assert_eq!(format!("{:?}", non_ascii), "\"d\\xe9j\\xe0 vu\"");
699+
assert_eq!(format!("{non_ascii:?}"), "\"d\\xe9j\\xe0 vu\"");
700700
let good_bytes = BStr::from_bytes(b"\xf0\x9f\xa6\x80");
701-
assert_eq!(format!("{:?}", good_bytes), "\"\\xf0\\x9f\\xa6\\x80\"");
701+
assert_eq!(format!("{good_bytes:?}"), "\"\\xf0\\x9f\\xa6\\x80\"");
702702
}
703703
}
704704

‎rust/macros/kunit.rs

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,7 @@ pub(crate) fn kunit_tests(attr: TokenStream, ts: TokenStream) -> TokenStream {
1515
}
1616

1717
if attr.len() > 255 {
18-
panic!(
19-
"The test suite name `{}` exceeds the maximum length of 255 bytes",
20-
attr
21-
)
18+
panic!("The test suite name `{attr}` exceeds the maximum length of 255 bytes")
2219
}
2320

2421
let mut tokens: Vec<_> = ts.into_iter().collect();
@@ -102,16 +99,14 @@ pub(crate) fn kunit_tests(attr: TokenStream, ts: TokenStream) -> TokenStream {
10299
let mut kunit_macros = "".to_owned();
103100
let mut test_cases = "".to_owned();
104101
for test in &tests {
105-
let kunit_wrapper_fn_name = format!("kunit_rust_wrapper_{}", test);
102+
let kunit_wrapper_fn_name = format!("kunit_rust_wrapper_{test}");
106103
let kunit_wrapper = format!(
107-
"unsafe extern \"C\" fn {}(_test: *mut kernel::bindings::kunit) {{ {}(); }}",
108-
kunit_wrapper_fn_name, test
104+
"unsafe extern \"C\" fn {kunit_wrapper_fn_name}(_test: *mut kernel::bindings::kunit) {{ {test}(); }}"
109105
);
110106
writeln!(kunit_macros, "{kunit_wrapper}").unwrap();
111107
writeln!(
112108
test_cases,
113-
" kernel::kunit::kunit_case(kernel::c_str!(\"{}\"), {}),",
114-
test, kunit_wrapper_fn_name
109+
" kernel::kunit::kunit_case(kernel::c_str!(\"{test}\"), {kunit_wrapper_fn_name}),"
115110
)
116111
.unwrap();
117112
}

‎rust/macros/module.rs

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ impl<'a> ModInfoBuilder<'a> {
4848
)
4949
} else {
5050
// Loadable modules' modinfo strings go as-is.
51-
format!("{field}={content}\0", field = field, content = content)
51+
format!("{field}={content}\0")
5252
};
5353

5454
write!(
@@ -126,10 +126,7 @@ impl ModuleInfo {
126126
};
127127

128128
if seen_keys.contains(&key) {
129-
panic!(
130-
"Duplicated key \"{}\". Keys can only be specified once.",
131-
key
132-
);
129+
panic!("Duplicated key \"{key}\". Keys can only be specified once.");
133130
}
134131

135132
assert_eq!(expect_punct(it), ':');
@@ -143,10 +140,7 @@ impl ModuleInfo {
143140
"license" => info.license = expect_string_ascii(it),
144141
"alias" => info.alias = Some(expect_string_array(it)),
145142
"firmware" => info.firmware = Some(expect_string_array(it)),
146-
_ => panic!(
147-
"Unknown key \"{}\". Valid keys are: {:?}.",
148-
key, EXPECTED_KEYS
149-
),
143+
_ => panic!("Unknown key \"{key}\". Valid keys are: {EXPECTED_KEYS:?}."),
150144
}
151145

152146
assert_eq!(expect_punct(it), ',');
@@ -158,7 +152,7 @@ impl ModuleInfo {
158152

159153
for key in REQUIRED_KEYS {
160154
if !seen_keys.iter().any(|e| e == key) {
161-
panic!("Missing required key \"{}\".", key);
155+
panic!("Missing required key \"{key}\".");
162156
}
163157
}
164158

@@ -170,10 +164,7 @@ impl ModuleInfo {
170164
}
171165

172166
if seen_keys != ordered_keys {
173-
panic!(
174-
"Keys are not ordered as expected. Order them like: {:?}.",
175-
ordered_keys
176-
);
167+
panic!("Keys are not ordered as expected. Order them like: {ordered_keys:?}.");
177168
}
178169

179170
info

‎rust/macros/paste.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ fn concat_helper(tokens: &[TokenTree]) -> Vec<(String, Span)> {
5050
let tokens = group.stream().into_iter().collect::<Vec<TokenTree>>();
5151
segments.append(&mut concat_helper(tokens.as_slice()));
5252
}
53-
token => panic!("unexpected token in paste segments: {:?}", token),
53+
token => panic!("unexpected token in paste segments: {token:?}"),
5454
};
5555
}
5656

‎rust/pin-init/internal/src/pinned_drop.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@ pub(crate) fn pinned_drop(_args: TokenStream, input: TokenStream) -> TokenStream
2828
// Found the end of the generics, this should be `PinnedDrop`.
2929
assert!(
3030
matches!(tt, TokenTree::Ident(i) if i.to_string() == "PinnedDrop"),
31-
"expected 'PinnedDrop', found: '{:?}'",
32-
tt
31+
"expected 'PinnedDrop', found: '{tt:?}'"
3332
);
3433
pinned_drop_idx = Some(i);
3534
break;

‎rust/uapi/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
unreachable_pub,
2525
unsafe_op_in_unsafe_fn
2626
)]
27+
#![cfg_attr(CONFIG_RUSTC_HAS_UNNECESSARY_TRANSMUTES, allow(unnecessary_transmutes))]
2728

2829
// Manual definition of blocklisted types.
2930
type __kernel_size_t = usize;

‎tools/objtool/check.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,7 @@ static bool is_rust_noreturn(const struct symbol *func)
227227
str_ends_with(func->name, "_4core9panicking19assert_failed_inner") ||
228228
str_ends_with(func->name, "_4core9panicking30panic_null_pointer_dereference") ||
229229
str_ends_with(func->name, "_4core9panicking36panic_misaligned_pointer_dereference") ||
230+
str_ends_with(func->name, "_7___rustc17rust_begin_unwind") ||
230231
strstr(func->name, "_4core9panicking13assert_failed") ||
231232
strstr(func->name, "_4core9panicking11panic_const24panic_const_") ||
232233
(strstr(func->name, "_4core5slice5index24slice_") &&

0 commit comments

Comments
 (0)