aboutsummaryrefslogtreecommitdiffstats
path: root/rust/macros/paste.rs
diff options
context:
space:
mode:
authorLinus Torvalds <[email protected]>2025-05-09 21:06:34 +0000
committerLinus Torvalds <[email protected]>2025-05-09 21:06:34 +0000
commit0e1329d4045ca3606f9c06a8c47f62e758a09105 (patch)
tree7c4e12c7e14f4b44aff9c80784933e6571e2a906 /rust/macros/paste.rs
parentMerge tag 'drm-fixes-2025-05-10' of https://gitlab.freedesktop.org/drm/kernel (diff)
parentx86/Kconfig: make CFI_AUTO_DEFAULT depend on !RUST or Rust >= 1.88 (diff)
downloadkernel-0e1329d4045ca3606f9c06a8c47f62e758a09105.tar.gz
kernel-0e1329d4045ca3606f9c06a8c47f62e758a09105.zip
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
Diffstat (limited to 'rust/macros/paste.rs')
-rw-r--r--rust/macros/paste.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/rust/macros/paste.rs b/rust/macros/paste.rs
index 6529a387673f..cce712d19855 100644
--- a/rust/macros/paste.rs
+++ b/rust/macros/paste.rs
@@ -50,7 +50,7 @@ fn concat_helper(tokens: &[TokenTree]) -> Vec<(String, Span)> {
let tokens = group.stream().into_iter().collect::<Vec<TokenTree>>();
segments.append(&mut concat_helper(tokens.as_slice()));
}
- token => panic!("unexpected token in paste segments: {:?}", token),
+ token => panic!("unexpected token in paste segments: {token:?}"),
};
}