[gcc/devel/rust/master] lang-items: Add From::from

[Thomas Schwinge via Gcc-cvs]

https://gcc.gnu.org/g:3c21102b7378b9a4d61c36689063f6104e751ff6

commit 3c21102b7378b9a4d61c36689063f6104e751ff6
Author: Arthur Cohen <arthur.co...@embecosm.com>
Date:   Thu Jan 23 11:46:48 2025 +0000

    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 6b8c6e4606b2..091c6b67ea53 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 aa7efb12fcac..b5abf615d594 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;