diff options
| author | Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com> | 2023-08-28 10:54:12 +0200 |
|---|---|---|
| committer | P-E-P <32375388+P-E-P@users.noreply.github.com> | 2023-09-05 14:05:36 +0000 |
| commit | f1527eff1e1387a19fe7db115f7157962780d72c (patch) | |
| tree | 58e582b17e8fca5609cd897342ab15cdc9c74c52 | |
| parent | 63af481671a78f3da748646c5939f3a82f58bb01 (diff) | |
| download | gcc-f1527eff1e1387a19fe7db115f7157962780d72c.zip gcc-f1527eff1e1387a19fe7db115f7157962780d72c.tar.gz gcc-f1527eff1e1387a19fe7db115f7157962780d72c.tar.bz2 | |
resolver: Refactor assertion
Change the condition with rust_unreachable to an assertion. This will
keep the code clean and concise.
Some styling issues appeared during review, this commit make the code
more readable.
gcc/rust/ChangeLog:
* resolve/rust-toplevel-name-resolver-2.0.cc (TopLevel::visit):
Change to assertion.
* util/rust-hir-map.cc (Mappings::lookup_derive_proc_macros):
Add empty line.
(Mappings::lookup_bang_proc_macros): Likewise.
(Mappings::lookup_attribute_proc_macros): Likewise.
Signed-off-by: Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com>
| -rw-r--r-- | gcc/rust/resolve/rust-toplevel-name-resolver-2.0.cc | 5 | ||||
| -rw-r--r-- | gcc/rust/util/rust-hir-map.cc | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/gcc/rust/resolve/rust-toplevel-name-resolver-2.0.cc b/gcc/rust/resolve/rust-toplevel-name-resolver-2.0.cc index 6125298..a09c738 100644 --- a/gcc/rust/resolve/rust-toplevel-name-resolver-2.0.cc +++ b/gcc/rust/resolve/rust-toplevel-name-resolver-2.0.cc @@ -75,9 +75,8 @@ void TopLevel::visit (AST::ExternCrate &crate) { CrateNum num; - if (!Analysis::Mappings::get ()->lookup_crate_name ( - crate.get_referenced_crate (), num)) - rust_unreachable (); + rust_assert (Analysis::Mappings::get ()->lookup_crate_name ( + crate.get_referenced_crate (), num)); auto attribute_macros = Analysis::Mappings::get ()->lookup_attribute_proc_macros (num); diff --git a/gcc/rust/util/rust-hir-map.cc b/gcc/rust/util/rust-hir-map.cc index fb3c78f..a742165 100644 --- a/gcc/rust/util/rust-hir-map.cc +++ b/gcc/rust/util/rust-hir-map.cc @@ -978,6 +978,7 @@ Mappings::lookup_derive_proc_macros (CrateNum num) auto it = procmacrosDeriveMappings.find (num); if (it == procmacrosDeriveMappings.end ()) return tl::nullopt; + return it->second; } @@ -987,6 +988,7 @@ Mappings::lookup_bang_proc_macros (CrateNum num) auto it = procmacrosBangMappings.find (num); if (it == procmacrosBangMappings.end ()) return tl::nullopt; + return it->second; } @@ -996,6 +998,7 @@ Mappings::lookup_attribute_proc_macros (CrateNum num) auto it = procmacrosAttributeMappings.find (num); if (it == procmacrosAttributeMappings.end ()) return tl::nullopt; + return it->second; } |