https://gcc.gnu.org/g:d1e920221043f03a2d6e84def6c380ee03ac79ec
commit r15-8760-gd1e920221043f03a2d6e84def6c380ee03ac79ec Author: Arthur Cohen <arthur.co...@embecosm.com> Date: Thu Jan 23 11:46:48 2025 +0000 gccrs: lang-items: Add From::from gcc/rust/ChangeLog: * util/rust-lang-item.h: Declare it. * util/rust-lang-item.cc: Use it. Diff: --- gcc/rust/util/rust-lang-item.cc | 2 ++ gcc/rust/util/rust-lang-item.h | 3 +++ 2 files changed, 5 insertions(+) diff --git a/gcc/rust/util/rust-lang-item.cc b/gcc/rust/util/rust-lang-item.cc index b37a237c24e6..145054ff9d72 100644 --- a/gcc/rust/util/rust-lang-item.cc +++ b/gcc/rust/util/rust-lang-item.cc @@ -110,6 +110,8 @@ const BiMap<std::string, LangItem::Kind> Rust::LangItem::lang_items = {{ {"into_result", Kind::TRY_INTO_RESULT}, {"from_error", Kind::TRY_FROM_ERROR}, {"from_ok", Kind::TRY_FROM_OK}, + + {"from", Kind::FROM_FROM}, }}; tl::optional<LangItem::Kind> diff --git a/gcc/rust/util/rust-lang-item.h b/gcc/rust/util/rust-lang-item.h index 851909d409c0..f30b93609b5e 100644 --- a/gcc/rust/util/rust-lang-item.h +++ b/gcc/rust/util/rust-lang-item.h @@ -141,6 +141,9 @@ public: TRY_INTO_RESULT, TRY_FROM_ERROR, TRY_FROM_OK, + + // NOTE: This is not a lang item in later versions of Rust + FROM_FROM, }; static const BiMap<std::string, Kind> lang_items;