gccrs: 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>

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 61252988673d79114b5edd4a922ff6a14fc57992..a09c738267e9859fd27ca54335623dcc6c7dfdb0 100644 (file)
--- 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 8ac957fd87d27860f06ccc38f2d37e95dc560853..7041aaa9945217b9b9c6abc8becd706e0a36d489 100644 (file)
--- 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;
 }