From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EAAC62EE262; Sun, 1 Mar 2026 02:05:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772330747; cv=none; b=b3RAQuJDDheVkvClPxa5FT5vv8O3tYG+WpHHjBlnBjwJMI24gz1G6QPn/21z/ee5zYo/DrvMUYXQE8BurwGrWWUlGaJcNv5/ODJ9cQDwsGiu9CJ6NhK5iPUJ0m6PLsNP61T2ZQ0OWzFgZ4kJpWnw2vGMioIVGH+CcAv3+h/UFTk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772330747; c=relaxed/simple; bh=x2o42VTPQAD77oDP6EAvRHF8itnSuz61zWDMTx9ZtzY=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=m5GLiE4ObbdnpIQrNchjtXfDqZ+p/C4gaxKzA+S6NfaZlYfjqJEXpTrxcsdx1kd7cVaJ12ZUhYFM0R98dlUkOEmqDqTgSSUEDFaA/p225L2etaWKEMgKTaKMBOArK1iumT9xBjs0ULIUhnKXVpYCOOVSy1H0Dv4+LgAtkwy0Q74= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=isAfmsfZ; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="isAfmsfZ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 59208C19421; Sun, 1 Mar 2026 02:05:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772330746; bh=x2o42VTPQAD77oDP6EAvRHF8itnSuz61zWDMTx9ZtzY=; h=From:To:Cc:Subject:Date:From; b=isAfmsfZnbucr7iZWGDrH5QM7iFPJBsc3VfJg5uP8NhC/PnEgJMh+XfcFCD9fhBSs 5uIk0xk/2kE2vAC+vLaa4Rx8KZKSmfTZKKGYchKPFetKnwY0uXBxv7rzpQyjKG5GZO y6t7KPJfaIeXLycOCPnXLlANx+oACWkvfx9fV17p3Hh8EKlITgUrboyRZ0vlMHdoBn RZJGa9hruUw6FKuttgziOi8k/Ykf3O1LXwc65HyO1LH04JTmmVoUDbdoH/KU3lMeat FsA2avH5rfvDUi59HJuWdMo3JRBz1S1QiE2rNh/SXzNhx1gjxqH2DDya8eSV3uAdKq 6vHL01BohKKJw== From: Sasha Levin To: stable@vger.kernel.org, lossin@kernel.org Cc: Miguel Ojeda , rust-for-linux@vger.kernel.org Subject: FAILED: Patch "rust: pin-init: replace clippy `expect` with `allow`" failed to apply to 5.10-stable tree Date: Sat, 28 Feb 2026 21:05:44 -0500 Message-ID: <20260301020545.1734572-1-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Hint: ignore X-stable: review Content-Transfer-Encoding: 8bit The patch below does not apply to the 5.10-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . Thanks, Sasha ------------------ original commit in Linus's tree ------------------ >From a58b8764aed9648357b1c5b6368c9943ba33b7f9 Mon Sep 17 00:00:00 2001 From: Benno Lossin Date: Sun, 15 Feb 2026 14:22:30 +0100 Subject: [PATCH] rust: pin-init: replace clippy `expect` with `allow` `clippy` has changed behavior in [1] (Rust 1.95) where it no longer warns about the `let_and_return` lint when a comment is placed between the let binding and the return expression. Nightly thus fails to build, because the expectation is no longer fulfilled. Thus replace the expectation with an `allow`. [ The errors were: error: this lint expectation is unfulfilled --> rust/pin-init/src/lib.rs:1279:10 | 1279 | #[expect(clippy::let_and_return)] | ^^^^^^^^^^^^^^^^^^^^^^ | = note: `-D unfulfilled-lint-expectations` implied by `-D warnings` = help: to override `-D warnings` add `#[allow(unfulfilled_lint_expectations)]` error: this lint expectation is unfulfilled --> rust/pin-init/src/lib.rs:1295:10 | 1295 | #[expect(clippy::let_and_return)] | ^^^^^^^^^^^^^^^^^^^^^^ - Miguel ] Link: https://github.com/rust-lang/rust-clippy/pull/16461 [1] Signed-off-by: Benno Lossin Cc: stable@vger.kernel.org # Needed in 6.18.y and later. Link: https://patch.msgid.link/20260215132232.1549861-1-lossin@kernel.org Signed-off-by: Miguel Ojeda --- rust/pin-init/src/lib.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rust/pin-init/src/lib.rs b/rust/pin-init/src/lib.rs index 8dc9dd5ac6fd3..3da65db9e2dd3 100644 --- a/rust/pin-init/src/lib.rs +++ b/rust/pin-init/src/lib.rs @@ -1276,13 +1276,13 @@ unsafe fn __pinned_init(self, slot: *mut T) -> Result<(), E> { /// /// - `*mut U` must be castable to `*mut T` and any value of type `T` written through such a /// pointer must result in a valid `U`. -#[expect(clippy::let_and_return)] pub const unsafe fn cast_pin_init(init: impl PinInit) -> impl PinInit { // SAFETY: initialization delegated to a valid initializer. Cast is valid by function safety // requirements. let res = unsafe { pin_init_from_closure(|ptr: *mut U| init.__pinned_init(ptr.cast::())) }; // FIXME: remove the let statement once the nightly-MSRV allows it (1.78 otherwise encounters a // cycle when computing the type returned by this function) + #[allow(clippy::let_and_return)] res } @@ -1292,13 +1292,13 @@ unsafe fn __pinned_init(self, slot: *mut T) -> Result<(), E> { /// /// - `*mut U` must be castable to `*mut T` and any value of type `T` written through such a /// pointer must result in a valid `U`. -#[expect(clippy::let_and_return)] pub const unsafe fn cast_init(init: impl Init) -> impl Init { // SAFETY: initialization delegated to a valid initializer. Cast is valid by function safety // requirements. let res = unsafe { init_from_closure(|ptr: *mut U| init.__init(ptr.cast::())) }; // FIXME: remove the let statement once the nightly-MSRV allows it (1.78 otherwise encounters a // cycle when computing the type returned by this function) + #[allow(clippy::let_and_return)] res } -- 2.51.0