From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from gimli.kloenk.de (gimli.kloenk.de [49.12.72.200]) (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 E9B491F78E4; Tue, 25 Mar 2025 17:01:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=49.12.72.200 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742922065; cv=none; b=d1thVuWrh39a4tHpSchyG5OhcubXpLG5dYf4lfiuRQhiqfiZ2Qubo/drKUWu1cX41F2UtX6+uKtgUQ9cNkxKGRXPeFljChNiSbP/+2WjEB0PN6oBEnaRDjXvGVe3Im1wifynvy0uZufaeImJX/mvX73zMECE+Az3Z2GaR23G8rk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742922065; c=relaxed/simple; bh=PwpIbtsMKdklh7mU8DSqzL9BZfqOSwkmWcxfEyJc++8=; h=From:To:Cc:Subject:In-Reply-To:References:Date:Message-ID: MIME-Version:Content-Type; b=kfi5a98C6+zHG0cgmI+mfj1bPYDyCvVsaCrguR3ROlr4eHhbJ/uW4n++mZyfviGc/2ghTcRWOW3654/rO9MkwZg9K3ZyUCCuDv8e0FuMB4dQTUDM0++FJD5oFbH07j3J5qIdPtJ8LowWKO+OpTKMDoHgziareo3qdDc6kdyK4BY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=kloenk.dev; spf=pass smtp.mailfrom=kloenk.dev; dkim=pass (1024-bit key) header.d=kloenk.dev header.i=@kloenk.dev header.b=M3yZMJSr; arc=none smtp.client-ip=49.12.72.200 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=kloenk.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kloenk.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=kloenk.dev header.i=@kloenk.dev header.b="M3yZMJSr" From: Fiona Behrens DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kloenk.dev; s=mail; t=1742921478; bh=0RJLNZjqqj5cxoZcag+7ikIRbyKubwxWsq91NsxmA38=; h=From:To:Cc:Subject:In-Reply-To:References:Date; b=M3yZMJSrPY0t0QhRXIsfJdRr0Bce4dQOJrFmJqVZJOnxDzCeQbGviQH6FHUdAruNB ZLrqDxJCHtcXOl2QgEaXacuMMt0aySgv9y1Mezqq27R4LB99FI43NTasvatYKFeNTq OdRZ4SbedxxmECBQgN5SJPQ7xurujal4WCdtltMw= To: Tamir Duberstein Cc: Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?utf-8?Q?Bj=C3=B6rn?= Roy Baron , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , Boris-Chengbiao Zhou , Kees Cook , rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org, Lukas Wirth Subject: Re: [PATCH v4 04/11] scripts: generate_rust_analyzer.py: extract `{build,register}_crate` In-Reply-To: <20250322-rust-analyzer-host-v4-4-1f51f9c907eb@gmail.com> (Tamir Duberstein's message of "Sat, 22 Mar 2025 09:23:39 -0400") References: <20250322-rust-analyzer-host-v4-0-1f51f9c907eb@gmail.com> <20250322-rust-analyzer-host-v4-4-1f51f9c907eb@gmail.com> Date: Tue, 25 Mar 2025 17:51:17 +0100 Message-ID: Precedence: bulk X-Mailing-List: rust-for-linux@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain Tamir Duberstein writes: > Extract helpers from `append_crate` to avoid the need to peek into > `crates[-1]`. This improves readability. > > Suggested-by: Trevor Gross > Signed-off-by: Tamir Duberstein Reviewed-by: Fiona Behrens > --- > scripts/generate_rust_analyzer.py | 35 ++++++++++++++++++++++++++++++----- > 1 file changed, 30 insertions(+), 5 deletions(-) > > diff --git a/scripts/generate_rust_analyzer.py b/scripts/generate_rust_analyzer.py > index e997d923268d..03f55cce673c 100755 > --- a/scripts/generate_rust_analyzer.py > +++ b/scripts/generate_rust_analyzer.py > @@ -35,7 +35,14 @@ def generate_crates(srctree, objtree, sysroot_src, external_src, cfgs): > crates_indexes = {} > crates_cfgs = args_crates_cfgs(cfgs) > > - def append_crate(display_name, root_module, deps, cfg=[], is_workspace_member=True, is_proc_macro=False): > + def build_crate( > + display_name, > + root_module, > + deps, > + cfg=[], > + is_workspace_member=True, > + is_proc_macro=False, > + ): > crate = { > "display_name": display_name, > "root_module": str(root_module), > @@ -54,9 +61,26 @@ def generate_crates(srctree, objtree, sysroot_src, external_src, cfgs): > stdin=subprocess.DEVNULL, > ).decode('utf-8').strip() > crate["proc_macro_dylib_path"] = f"{objtree}/rust/{proc_macro_dylib_name}" > - crates_indexes[display_name] = len(crates) > + return crate > + > + def register_crate(crate): > + crates_indexes[crate["display_name"]] = len(crates) > crates.append(crate) > > + def append_crate( > + display_name, > + root_module, > + deps, > + cfg=[], > + is_workspace_member=True, > + is_proc_macro=False, > + ): > + register_crate( > + build_crate( > + display_name, root_module, deps, cfg, is_workspace_member, is_proc_macro > + ) > + ) > + > def append_sysroot_crate( > display_name, > deps, > @@ -116,20 +140,21 @@ def generate_crates(srctree, objtree, sysroot_src, external_src, cfgs): > display_name, > deps, > ): > - append_crate( > + crate = build_crate( > display_name, > srctree / "rust" / display_name / "lib.rs", > deps, > cfg=cfg, > ) > - crates[-1]["env"]["OBJTREE"] = str(objtree.resolve(True)) > - crates[-1]["source"] = { > + crate["env"]["OBJTREE"] = str(objtree.resolve(True)) > + crate["source"] = { > "include_dirs": [ > str(srctree / "rust" / display_name), > str(objtree / "rust") > ], > "exclude_dirs": [], > } > + register_crate(crate) > > append_crate_with_generated("bindings", ["core"]) > append_crate_with_generated("uapi", ["core"])