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 1A6BA3876D0; Fri, 24 Apr 2026 13:44:37 +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=1777038277; cv=none; b=ajZCjeFAJlPabl3Wdtamxirw8DXI5zN4wbzldBoOPS4nknfFob0ZVFZidebHRIkZvZ1/yqGBv90dxQO8twhWnsoPHYANcFNjTvnvHHqMtWMevCDMtInNIs1+JzIqhte0LRvfdrdaNVGnhXfBWyj8JC3eFBlyk41BUMPLZCTlv1E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777038277; c=relaxed/simple; bh=j9FDuY1cgQbrN3rivA9UzTSH0v5cGqrVxUHAnQzSBgo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MUu8V8y88NvQZO/iWUorLUpX1sUbBrNWRnJReIP16zCNsSp3d9GQuPkvSaY1gRUfouuqz3cbngpkRn3Q52Hz3MmIFPk9cGbxove2QUm5Wo7yIBFkEUlWXuEGogwemq4C+PVvMELNpaBhNmC6eumXgykJtarHBvWec0Z2M+rR3lY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=KIOr7xSq; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="KIOr7xSq" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A5C2EC19425; Fri, 24 Apr 2026 13:44:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1777038277; bh=j9FDuY1cgQbrN3rivA9UzTSH0v5cGqrVxUHAnQzSBgo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KIOr7xSqAHNXTyyAzrRQJrqoKHcOszygvHhnnEpzR5XlLUHcNpR2nztQ16EntGSVh sJLT4BjqTwgFvI3wRGspNSwSbedu91pW0P3gxEuJGZ+90jSTY/qGOni0Hd2jrrae40 fU9y5hc9tDI5Spc6bSscjCuFUCFmV+qlQSSMc0Z8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Daniel Almeida , Fiona Behrens , Trevor Gross , Tamir Duberstein , Sasha Levin Subject: [PATCH 6.12 09/35] scripts: generate_rust_analyzer.py: define scripts Date: Fri, 24 Apr 2026 15:31:16 +0200 Message-ID: <20260424132413.610260620@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260424132411.427029259@linuxfoundation.org> References: <20260424132411.427029259@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Tamir Duberstein [ Upstream commit 36c619f6bd793493294becb10a02fea370b67a91 ] Add IDE support for host-side scripts written in Rust. This support has been missing since these scripts were initially added in commit 9a8ff24ce584 ("scripts: add `generate_rust_target.rs`"), thus add it. Change the existing instance of extension stripping to `pathlib.Path.stem` to maintain code consistency. Fixes: 9a8ff24ce584 ("scripts: add `generate_rust_target.rs`") Cc: stable@vger.kernel.org Reviewed-by: Daniel Almeida Reviewed-by: Fiona Behrens Reviewed-by: Trevor Gross Link: https://patch.msgid.link/20260122-rust-analyzer-scripts-v1-1-ff6ba278170e@kernel.org Signed-off-by: Tamir Duberstein [ changed `[std]` dep to `["std"]` and kept untyped `is_root_crate()` ] Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- scripts/generate_rust_analyzer.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) --- a/scripts/generate_rust_analyzer.py +++ b/scripts/generate_rust_analyzer.py @@ -144,6 +144,18 @@ def generate_crates(srctree, objtree, sy append_crate_with_generated("uapi", ["core", "ffi"]) append_crate_with_generated("kernel", ["core", "macros", "build_error", "ffi", "bindings", "uapi"]) + scripts = srctree / "scripts" + makefile = (scripts / "Makefile").read_text() + for path in scripts.glob("*.rs"): + name = path.stem + if f"{name}-rust" not in makefile: + continue + append_crate( + name, + path, + ["std"], + ) + def is_root_crate(build_file, target): try: contents = build_file.read_text() @@ -160,7 +172,7 @@ def generate_crates(srctree, objtree, sy for folder in extra_dirs: for path in folder.rglob("*.rs"): logging.info("Checking %s", path) - name = path.name.replace(".rs", "") + name = path.stem # Skip those that are not crate roots. if not is_root_crate(path.parent / "Makefile", name) and \