]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
rust: compile libcore with edition 2024 for 1.87+
authorGary Guo <gary@garyguo.net>
Sat, 17 May 2025 08:55:59 +0000 (09:55 +0100)
committerMiguel Ojeda <ojeda@kernel.org>
Sun, 25 May 2025 20:59:47 +0000 (22:59 +0200)
commitf4daa80d6be7d3c55ca72a8e560afc4e21f886aa
treee89956fc4b3450a467d320d0a387a6a1a094a6f8
parentdf523db15a06c37cbabad8f477ae87d08c9081f2
rust: compile libcore with edition 2024 for 1.87+

Rust 1.87 (released on 2025-05-15) compiles core library with edition
2024 instead of 2021 [1]. Ensure that the edition matches libcore's
expectation to avoid potential breakage.

[ J3m3 reported in Zulip [2] that the `rust-analyzer` target was
  broken after this patch -- indeed, we need to avoid `core-cfgs`
  since those are passed to the `rust-analyzer` target.

  So, instead, I tweaked the patch to create a new `core-edition`
  variable and explicitly mention the `--edition` flag instead of
  reusing `core-cfg`s.

  In addition, pass a new argument using this new variable to
  `generate_rust_analyzer.py` so that we set the right edition there.

  By the way, for future reference: the `filter-out` change is needed
  for Rust < 1.87, since otherwise we would skip the `--edition=2021`
  we just added, ending up with no edition flag, and thus the compiler
  would default to the 2015 one.

  [2] https://rust-for-linux.zulipchat.com/#narrow/channel/291565/topic/x/near/520206547

    - Miguel ]

Cc: stable@vger.kernel.org # Needed in 6.12.y and later (Rust is pinned in older LTSs).
Link: https://github.com/rust-lang/rust/pull/138162
Reported-by: est31 <est31@protonmail.com>
Closes: https://github.com/Rust-for-Linux/linux/issues/1163
Signed-off-by: Gary Guo <gary@garyguo.net>
Link: https://lore.kernel.org/r/20250517085600.2857460-1-gary@garyguo.net
Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
rust/Makefile
scripts/generate_rust_analyzer.py