Re: [PATCH 1/6] scripts: generate_rust_analyzer: rename cfg to generated_cfg

[Tamir Duberstein]

On Tue, Jan 20, 2026 at 10:28 AM Tamir Duberstein <tamird@xxxxxxxxxx> wrote:
>
> On Tue, Jan 20, 2026 at 3:54 AM Eliot Courtney <ecourtney@xxxxxxxxxx> wrote:
> >
> > This variable is for the cfg from generated files. It's also easy to
> > confuse with the `cfg` parameter in append_crate(), so rename it.
> >
> > Signed-off-by: Eliot Courtney <ecourtney@xxxxxxxxxx>
>
> I have the same change sitting around locally.
>
> Reviewed-by: Tamir Duberstein <tamird@xxxxxxxxxx>
>
>
> > ---
> >  scripts/generate_rust_analyzer.py | 8 ++++----
> >  1 file changed, 4 insertions(+), 4 deletions(-)
> >
> > diff --git a/scripts/generate_rust_analyzer.py b/scripts/generate_rust_analyzer.py
> > index 3b645da90092..c188d1f1fd5b 100755
> > --- a/scripts/generate_rust_analyzer.py
> > +++ b/scripts/generate_rust_analyzer.py
> > @@ -21,12 +21,12 @@ def args_crates_cfgs(cfgs):
> >
> >  def generate_crates(srctree, objtree, sysroot_src, external_src, cfgs, core_edition):
> >      # Generate the configuration list.
> > -    cfg = []
> > +    generated_cfg = []
> >      with open(objtree / "include" / "generated" / "rustc_cfg") as fd:
> >          for line in fd:
> >              line = line.replace("--cfg=", "")
> >              line = line.replace("\n", "")
> > -            cfg.append(line)
> > +            generated_cfg.append(line)
> >
> >      # Now fill the crates list -- dependencies need to come first.
> >      #
> > @@ -173,7 +173,7 @@ def generate_crates(srctree, objtree, sysroot_src, external_src, cfgs, core_edit
> >              display_name,
> >              srctree / "rust"/ display_name / "lib.rs",
> >              deps,
> > -            cfg=cfg,
> > +            cfg=generated_cfg,
> >          )
> >          crates[-1]["env"]["OBJTREE"] = str(objtree.resolve(True))
> >          crates[-1]["source"] = {
> > @@ -215,7 +215,7 @@ def generate_crates(srctree, objtree, sysroot_src, external_src, cfgs, core_edit
> >                  name,
> >                  path,
> >                  ["core", "kernel"],
> > -                cfg=cfg,
> > +                cfg=generated_cfg,
> >              )
> >
> >      return crates
> >
> > --
> > 2.52.0
> >
> >

Applied to `rust-analyzer-next` (just this patch). Thanks!

  [ Changed title to include script extension. - Tamir ]