public inbox for stable@vger.kernel.org
 help / color / mirror / Atom feed
From: Sasha Levin <sashal@kernel.org>
To: stable@vger.kernel.org, ojeda@kernel.org
Cc: Sasha Levin <sashal@kernel.org>
Subject: Re: [PATCH 6.14.y] rust: clean Rust 1.88.0's `clippy::uninlined_format_args` lint
Date: Mon, 12 May 2025 17:52:36 -0400	[thread overview]
Message-ID: <20250512170256-aa13e96862457ea5@stable.kernel.org> (raw)
In-Reply-To: <20250512131657.1407076-1-ojeda@kernel.org>

[ Sasha's backport helper bot ]

Hi,

Summary of potential issues:
⚠️ Found matching upstream commit but patch is missing proper reference to it

Found matching upstream commit: 211dcf77856db64c73e0c3b9ce0c624ec855daca

Note: The patch differs from the upstream commit:
---
1:  211dcf77856db ! 1:  3d50fea3c59c6 rust: clean Rust 1.88.0's `clippy::uninlined_format_args` lint
    @@ Commit message
         Reviewed-by: Alice Ryhl <aliceryhl@google.com>
         Link: https://lore.kernel.org/r/20250502140237.1659624-6-ojeda@kernel.org
         Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
    -
    - ## drivers/gpu/nova-core/gpu.rs ##
    -@@ drivers/gpu/nova-core/gpu.rs: pub(crate) fn arch(&self) -> Architecture {
    - // For now, redirect to fmt::Debug for convenience.
    - impl fmt::Display for Chipset {
    -     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
    --        write!(f, "{:?}", self)
    -+        write!(f, "{self:?}")
    -     }
    - }
    - 
    +    (cherry picked from commit 211dcf77856db64c73e0c3b9ce0c624ec855daca)
    +    Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
     
      ## rust/kernel/str.rs ##
     @@ rust/kernel/str.rs: fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
    @@ rust/kernel/str.rs: fn test_cstr_display_all_bytes() {
      }
      
     
    - ## rust/macros/kunit.rs ##
    -@@ rust/macros/kunit.rs: pub(crate) fn kunit_tests(attr: TokenStream, ts: TokenStream) -> TokenStream {
    -     }
    - 
    -     if attr.len() > 255 {
    --        panic!(
    --            "The test suite name `{}` exceeds the maximum length of 255 bytes",
    --            attr
    --        )
    -+        panic!("The test suite name `{attr}` exceeds the maximum length of 255 bytes")
    -     }
    - 
    -     let mut tokens: Vec<_> = ts.into_iter().collect();
    -@@ rust/macros/kunit.rs: pub(crate) fn kunit_tests(attr: TokenStream, ts: TokenStream) -> TokenStream {
    -     let mut kunit_macros = "".to_owned();
    -     let mut test_cases = "".to_owned();
    -     for test in &tests {
    --        let kunit_wrapper_fn_name = format!("kunit_rust_wrapper_{}", test);
    -+        let kunit_wrapper_fn_name = format!("kunit_rust_wrapper_{test}");
    -         let kunit_wrapper = format!(
    --            "unsafe extern \"C\" fn {}(_test: *mut kernel::bindings::kunit) {{ {}(); }}",
    --            kunit_wrapper_fn_name, test
    -+            "unsafe extern \"C\" fn {kunit_wrapper_fn_name}(_test: *mut kernel::bindings::kunit) {{ {test}(); }}"
    -         );
    -         writeln!(kunit_macros, "{kunit_wrapper}").unwrap();
    -         writeln!(
    -             test_cases,
    --            "    kernel::kunit::kunit_case(kernel::c_str!(\"{}\"), {}),",
    --            test, kunit_wrapper_fn_name
    -+            "    kernel::kunit::kunit_case(kernel::c_str!(\"{test}\"), {kunit_wrapper_fn_name}),"
    -         )
    -         .unwrap();
    -     }
    -
      ## rust/macros/module.rs ##
     @@ rust/macros/module.rs: fn emit_base(&mut self, field: &str, content: &str, builtin: bool) {
                  )
    @@ rust/macros/paste.rs: fn concat_helper(tokens: &[TokenTree]) -> Vec<(String, Spa
          }
      
     
    - ## rust/pin-init/internal/src/pinned_drop.rs ##
    -@@ rust/pin-init/internal/src/pinned_drop.rs: pub(crate) fn pinned_drop(_args: TokenStream, input: TokenStream) -> TokenStream
    + ## rust/macros/pinned_drop.rs ##
    +@@ rust/macros/pinned_drop.rs: pub(crate) fn pinned_drop(_args: TokenStream, input: TokenStream) -> TokenStream
                  // Found the end of the generics, this should be `PinnedDrop`.
                  assert!(
                      matches!(tt, TokenTree::Ident(i) if i.to_string() == "PinnedDrop"),
---

Results of testing on various branches:

| Branch                    | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-6.14.y       |  Success    |  Success   |

      reply	other threads:[~2025-05-12 21:52 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-05-12  9:02 FAILED: patch "[PATCH] rust: clean Rust 1.88.0's `clippy::uninlined_format_args`" failed to apply to 6.14-stable tree gregkh
2025-05-12 13:16 ` [PATCH 6.14.y] rust: clean Rust 1.88.0's `clippy::uninlined_format_args` lint Miguel Ojeda
2025-05-12 21:52   ` Sasha Levin [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250512170256-aa13e96862457ea5@stable.kernel.org \
    --to=sashal@kernel.org \
    --cc=ojeda@kernel.org \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox