From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 94DBDC52D7C for ; Mon, 12 Aug 2024 13:08:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D723D6B008A; Mon, 12 Aug 2024 09:08:05 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D23066B008C; Mon, 12 Aug 2024 09:08:05 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BC2676B0092; Mon, 12 Aug 2024 09:08:05 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 9F48A6B008A for ; Mon, 12 Aug 2024 09:08:05 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 42758161CDD for ; Mon, 12 Aug 2024 13:08:05 +0000 (UTC) X-FDA: 82443621330.14.274A5CB Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf17.hostedemail.com (Postfix) with ESMTP id 34AC540030 for ; Mon, 12 Aug 2024 13:08:02 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=qBvfTgvr; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf17.hostedemail.com: domain of dakr@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=dakr@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1723468005; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=LTBITdi4LEvQvrnXinrpGwm0k9WZzWqVLZHp5pNIvsg=; b=disms5cl5V0Mm2bQeNKpb5NyftZDq/vps1GSMruiZU6zVmbUU1ExG019OhJOYV7YU0JORx ciE/7grn391RHu0t7Rg3369RN3e34ufmOBBTOsvri3Q6D8tLBkfN4psq8ZPDUGA32KNwzd 9P+AUib34sb5KPahlI80Rxj/BDQLis0= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1723468005; a=rsa-sha256; cv=none; b=0L5hDs5IBoxkzK9yHJcsF/8UhWz6ZI3hD/Z3pn98n0oqDRK4IJNd5s6fFjtnu00G5A1fJb bcSPEDIbCIE9Hs8rgi3drJEokbzYlEgni4gxtIqfV3MjiKLAnmcw5q59a5tUrnZBpMIvF/ F28lylZyePTc+Oir2AYNlvB8nGsgNr0= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=qBvfTgvr; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf17.hostedemail.com: domain of dakr@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=dakr@kernel.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id ED05E6118E; Mon, 12 Aug 2024 13:08:01 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3EC35C32782; Mon, 12 Aug 2024 13:07:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1723468081; bh=mNOmgZvssvqvOmmQmFvMAXtyfF1xbPceHUTYeWaEFTE=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=qBvfTgvrGP/vxPP3bkzuGEF/AgYxIw2GfAVRf2qWOtXZC+C0NjR2RjCu52v7X6XEW sm6pnpg3pBT/1qL4iyQ1uo2PAxAEtwiYJuei6xT8RZKceKDpz/hEIPqyP0SasP5adV CAAdGnHEJfuMfQUNTtmC6W/D+Y/ZGEnwh5hlzALYDY/6wFmP7zvJ+YWO/Osbwu8BvU zOcOQ9bkCDtHTHVACY2aohYLWJztM5FkdPNIhIlL6DHKGiyP/o5GQdxaH3gWV0Z5j9 tfrt2JcduLBBjDDekTNB8soSdZ6rOqPzpl8mKG9iPf7YQNVdCzaEjoAstOE++3IAgC BtdyGCciRl7jg== Message-ID: Date: Mon, 12 Aug 2024 15:07:54 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v4 26/28] rust: str: test: replace `alloc::format` To: Benno Lossin Cc: ojeda@kernel.org, alex.gaynor@gmail.com, wedsonaf@gmail.com, boqun.feng@gmail.com, gary@garyguo.net, bjorn3_gh@protonmail.com, a.hindborg@samsung.com, aliceryhl@google.com, akpm@linux-foundation.org, daniel.almeida@collabora.com, faith.ekstrand@collabora.com, boris.brezillon@collabora.com, lina@asahilina.net, mcanal@igalia.com, zhiw@nvidia.com, acurrid@nvidia.com, cjia@nvidia.com, jhubbard@nvidia.com, airlied@redhat.com, ajanulgu@redhat.com, lyude@redhat.com, linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, linux-mm@kvack.org References: <20240805152004.5039-1-dakr@kernel.org> <20240805152004.5039-27-dakr@kernel.org> <51d38447-9906-42fd-9e5e-b43983d3a366@proton.me> From: Danilo Krummrich Content-Language: en-US In-Reply-To: <51d38447-9906-42fd-9e5e-b43983d3a366@proton.me> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 34AC540030 X-Stat-Signature: bmaakdrc5y5sgj7i63kifpj8d5diysub X-Rspam-User: X-HE-Tag: 1723468082-672071 X-HE-Meta: U2FsdGVkX18niZ5Crapq8UAop1hm+UtfNwvB7YSUV92csoUEjvtPjuYKCU2cv/Ec+LLRoEMH3gvXLuS5XlRxU6sqir82SJxIvGOrsTcbcWZK/YuSDxeLGRYBYsQtl3cmVNHYZL5Ei+JuXBm+iDixiM4oZN3N7w9HNib/Z7CSvdhVaHf78oX0baHcOO3x27zA5zXHwR5uxfCvUG4wQzLsVzn4zpOK2CCHpYuQpyg11/IkEP0c/JC6DkNS1a9YYstq61E+bNAi9Hw1zHIPuSvBhsLGEmPvJRHE9dwNdSmGq+8p6tlJUALBTBTVpQrFlaoKWBAUtzX7NqM4QAz0Xv8QxBYqIgAmO1Ff+TGOQGhH78cqyU6uAR2pQrWKyyBU2qgrCbRhwYqbIBqqG4q0O13kjZxM3GMiQlNNjCrbSskxPiSUFelFV7Xei/aIUDI6EnNLH1mVjPxd+QZ4kn/zxRWPCcjqumAQ1ALDZ0Esh0V7NbIKfg0x28zTTgRMTdkQTV0u0hpcvFfTIFByu+5iFXwsdVcsRv7wFyex1tHNUOgtoDogRgEjsPF/SCRoKH8SXgkPgmWRGbNaxw30idA6VJXFsMdHRbb7M+TPua3OIEEmea3QStmQGZVA/hnTeEgU9MiWchzrEiX5NnWG69GacSXHK+N6/Ol7VVmCh3nYrsmZpbNMzYlpk5w+scCNwtpRirQNqNW4ByTbow7oxAiZ31Pl/jLph2diJ2FebwW0qF6f+K0Kfqw+rO7vI5txFCBTFEvt5Swhs89vzeoIwCdELhHWtutZ++v99+05JtLzp34iCPJVeuRCUxswn0yMDNWaCQKoKTx76KOf528vxlhkkfRX57c2EZt2ucuX9PViSGL/mkEcM8RNW6jAR+GRQzeFtH0ntYxvGNskzimjioYZsghnnd0+lWclnjFkFcd72TWzGzDwNYYtZBFYacungmksPoDYI7TBhmebfzs4Q8sSnoy gwQ1hI04 hmLw2n0ImcHz4MflYK9Diz5hdz7jFmhzC1FxXpJAJ+atC7TrS1DMOsL3emENhu50m8CikUpSBsFFigK3BXmBSWxn+vtjBoSkjKCnen1xWW4fa/RFvRUYAHnmtNc7b+jNFHDxIugxPrXVOMM54KEpp/PDt3A78WGg338kGK0chvEZlyIjAaHQXRS8cwFWXiTN1GQ/VOdeLQTUTmDESPThSXsDo1RorHYML5jUL4xG1LK/9x2dSvbSL2TSKF4j5bkJQMQGnEmF4a7StmsHgKVjzevWG070HkvoZTalT+xiPXYkF0dRlFzdq/7qzIrzev09jz6S0YO86G1hVjq88NNGgaPq+6FpxRnDcb6rC0106nQt9R2Q= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: On 8/8/24 9:22 AM, Benno Lossin wrote: > On 05.08.24 17:19, Danilo Krummrich wrote: >> The current implementation of tests in str.rs use `format!` to format >> strings for comparison, which, internally, creates a new `String`. >> >> In order to prepare for getting rid of Rust's alloc crate, we have to >> cut this dependency. Instead, implement `format!` for `CString`. >> >> Note that for userspace tests, `Kmalloc`, which is backing `CString`'s >> memory, is just a type alias to `Cmalloc`. >> >> Signed-off-by: Danilo Krummrich >> --- >> rust/kernel/str.rs | 23 ++++++++++++++++++++++- >> 1 file changed, 22 insertions(+), 1 deletion(-) >> >> diff --git a/rust/kernel/str.rs b/rust/kernel/str.rs >> index 0b6ffbade521..8f234224cbf5 100644 >> --- a/rust/kernel/str.rs >> +++ b/rust/kernel/str.rs >> @@ -523,7 +523,28 @@ macro_rules! c_str { >> #[cfg(test)] >> mod tests { >> use super::*; >> - use alloc::format; >> + >> + struct String(CString); >> + >> + impl String { >> + fn from_fmt(args: fmt::Arguments<'_>) -> Self { >> + String(CString::try_from_fmt(args).unwrap()) >> + } >> + } >> + >> + impl Deref for String { >> + type Target = str; >> + >> + fn deref(&self) -> &str { >> + self.0.to_str().unwrap() >> + } >> + } > > Don't actually think we need this newtype. Right, but I thought it's a bit more extensible and cleaner than... > >> + >> + macro_rules! format { >> + ($($f:tt)*) => ({ >> + &*String::from_fmt(kernel::fmt!($($f)*)) > > We could just do this: > > CString::try_from_fmt(kernel::fmt!($(f)*)).unwrap().to_str().unwrap() ...doing it inline. I'm fine either way, but unless you really want me to change it, I'd rather keep it as it is. > > --- > Cheers, > Benno > >> + }) >> + } >> >> const ALL_ASCII_CHARS: &'static str = >> "\\x01\\x02\\x03\\x04\\x05\\x06\\x07\\x08\\x09\\x0a\\x0b\\x0c\\x0d\\x0e\\x0f\ >> -- >> 2.45.2 >> >