Skip to content

Commit 2438990

Browse files
committed
Merge tag 'rust-fixes-6.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/ojeda/linux
Pull rust fixes from Miguel Ojeda: - Fix objtool warning due to future Rust 1.85.0 (to be released in a few days) - Clean future Rust 1.86.0 (to be released 2025-04-03) Clippy warning * tag 'rust-fixes-6.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/ojeda/linux: rust: rbtree: fix overindented list item objtool/rust: add one more `noreturn` Rust function
2 parents d440148 + 2e4f982 commit 2438990

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

rust/kernel/rbtree.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1149,7 +1149,7 @@ pub struct VacantEntry<'a, K, V> {
11491149
/// # Invariants
11501150
/// - `parent` may be null if the new node becomes the root.
11511151
/// - `child_field_of_parent` is a valid pointer to the left-child or right-child of `parent`. If `parent` is
1152-
/// null, it is a pointer to the root of the [`RBTree`].
1152+
/// null, it is a pointer to the root of the [`RBTree`].
11531153
struct RawVacantEntry<'a, K, V> {
11541154
rbtree: *mut RBTree<K, V>,
11551155
/// The node that will become the parent of the new node if we insert one.

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, "_4core9panicking18panic_bounds_check") ||
228228
str_ends_with(func->name, "_4core9panicking19assert_failed_inner") ||
229229
str_ends_with(func->name, "_4core9panicking36panic_misaligned_pointer_dereference") ||
230+
strstr(func->name, "_4core9panicking13assert_failed") ||
230231
strstr(func->name, "_4core9panicking11panic_const24panic_const_") ||
231232
(strstr(func->name, "_4core5slice5index24slice_") &&
232233
str_ends_with(func->name, "_fail"));

0 commit comments

Comments
 (0)