From d75c82ef1750a60c6cbdd41f01ed814a07faaeec Mon Sep 17 00:00:00 2001 From: Pierre-Emmanuel Patry Date: Fri, 3 May 2024 13:25:20 +0200 Subject: gccrs: Change lookup_module function return type Wrap the return type into an optional. gcc/rust/ChangeLog: * checks/errors/privacy/rust-visibility-resolver.cc: Update function call to match the new return type. * typecheck/rust-hir-type-check-path.cc (TypeCheckExpr::resolve_root_path): Likewise. * typecheck/rust-hir-type-check-type.cc (TypeCheckType::resolve_root_path): Likewise. * util/rust-hir-map.cc (Mappings::insert_module): Likewise. (Mappings::lookup_module): Change the function's return type. * util/rust-hir-map.h: Update the function's prototype. Signed-off-by: Pierre-Emmanuel Patry --- gcc/rust/util/rust-hir-map.cc | 6 +++--- gcc/rust/util/rust-hir-map.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'gcc/rust/util') diff --git a/gcc/rust/util/rust-hir-map.cc b/gcc/rust/util/rust-hir-map.cc index 7c4fd1b..c77ffea 100644 --- a/gcc/rust/util/rust-hir-map.cc +++ b/gcc/rust/util/rust-hir-map.cc @@ -489,18 +489,18 @@ void Mappings::insert_module (HIR::Module *module) { auto id = module->get_mappings ().get_hirid (); - rust_assert (lookup_module (id) == nullptr); + rust_assert (!lookup_module (id)); hirModuleMappings[id] = module; insert_node_to_hir (module->get_mappings ().get_nodeid (), id); } -HIR::Module * +tl::optional Mappings::lookup_module (HirId id) { auto it = hirModuleMappings.find (id); if (it == hirModuleMappings.end ()) - return nullptr; + return tl::nullopt; return it->second; } diff --git a/gcc/rust/util/rust-hir-map.h b/gcc/rust/util/rust-hir-map.h index da3aa9f..753e06f 100644 --- a/gcc/rust/util/rust-hir-map.h +++ b/gcc/rust/util/rust-hir-map.h @@ -138,7 +138,7 @@ public: tl::optional lookup_impl_block_type (HirId id); void insert_module (HIR::Module *module); - HIR::Module *lookup_module (HirId id); + tl::optional lookup_module (HirId id); void insert_hir_implitem (HirId parent_impl_id, HIR::ImplItem *item); HIR::ImplItem *lookup_hir_implitem (HirId id, HirId *parent_impl_id); -- cgit v1.1