diff options
Diffstat (limited to 'gcc/rust/util/rust-hir-map.cc')
| -rw-r--r-- | gcc/rust/util/rust-hir-map.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gcc/rust/util/rust-hir-map.cc b/gcc/rust/util/rust-hir-map.cc index 24c8d61..64f2f5c 100644 --- a/gcc/rust/util/rust-hir-map.cc +++ b/gcc/rust/util/rust-hir-map.cc @@ -312,7 +312,7 @@ Mappings::insert_defid_mapping (DefId id, HIR::Item *item) CrateNum crate_num = id.crateNum; LocalDefId local_def_id = id.localDefId; - rust_assert (lookup_defid (id) == nullptr); + rust_assert (!lookup_defid (id)); rust_assert (lookup_local_defid (crate_num, local_def_id) == nullptr); rust_assert (lookup_trait_item_defid (id) == nullptr); @@ -320,12 +320,12 @@ Mappings::insert_defid_mapping (DefId id, HIR::Item *item) insert_local_defid_mapping (crate_num, local_def_id, item); } -HIR::Item * +tl::optional<HIR::Item *> Mappings::lookup_defid (DefId id) { auto it = defIdMappings.find (id); if (it == defIdMappings.end ()) - return nullptr; + return tl::nullopt; return it->second; } @@ -336,7 +336,7 @@ Mappings::insert_defid_mapping (DefId id, HIR::TraitItem *item) CrateNum crate_num = id.crateNum; LocalDefId local_def_id = id.localDefId; - rust_assert (lookup_defid (id) == nullptr); + rust_assert (!lookup_defid (id)); rust_assert (lookup_local_defid (crate_num, local_def_id) == nullptr); rust_assert (lookup_trait_item_defid (id) == nullptr); |