From: Arthur Cohen <[email protected]>
gcc/rust/ChangeLog:
* util/rust-lang-item.h: Declare it.
* util/rust-lang-item.cc: Use it.
---
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 b37a237c24e..145054ff9d7 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 851909d409c..f30b93609b5 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;
--
2.45.2