From: Pierre-Emmanuel Patry <[email protected]>
Most variables in the rust front end use snake case instead of camel
case. Also rename the ast_crate_mapping variable given we already are
in a mapping context.
gcc/rust/ChangeLog:
* util/rust-hir-map.cc (CrateMappings::CrateMappings): Update variable
name at call site.
(CrateMappings::get_next_crate_num): Likewise.
(CrateMappings::set_current_crate): Likewise.
(CrateMappings::get_current_crate): Likewise.
(CrateMappings::get_ast_crate): Likewise.
(CrateMappings::get_ast_crate_by_node_id_raw): Likewise.
(CrateMappings::insert_ast_crate): Likewise.
* util/rust-hir-map.h (class CrateMappings): Rename variables.
Signed-off-by: Pierre-Emmanuel Patry <[email protected]>
---
This change was merged into the gccrs repository and is posted here for
upstream visibility and potential drive-by review, as requested by GCC
release managers.
Each commit email contains a link to its details on github from where you can
find the Pull-Request and associated discussions.
Commit on github:
https://github.com/Rust-GCC/gccrs/commit/0c3711b3e1a7771032351e99db617e27c719deae
The commit has NOT been mentioned in any issue.
The commit has been mentioned in the following pull-request(s):
- https://github.com/Rust-GCC/gccrs/pull/4878
gcc/rust/util/rust-hir-map.cc | 32 ++++++++++++++++----------------
gcc/rust/util/rust-hir-map.h | 6 +++---
2 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/gcc/rust/util/rust-hir-map.cc b/gcc/rust/util/rust-hir-map.cc
index 8876311b7..35b9fe19c 100644
--- a/gcc/rust/util/rust-hir-map.cc
+++ b/gcc/rust/util/rust-hir-map.cc
@@ -99,7 +99,7 @@ static const HirId kDefaultHirIdBegin = 1;
static const HirId kDefaultCrateNumBegin = 0;
CrateMappings::CrateMappings ()
- : crateNumItr (kDefaultCrateNumBegin), currentCrateNum (UNKNOWN_CRATENUM)
+ : crate_num_itr (kDefaultCrateNumBegin), current_crate_num (UNKNOWN_CRATENUM)
{}
Mappings::Mappings ()
@@ -126,8 +126,8 @@ Mappings::get ()
CrateNum
CrateMappings::get_next_crate_num (const std::string &name)
{
- auto id = crateNumItr;
- crateNumItr++;
+ auto id = crate_num_itr;
+ crate_num_itr++;
crate_names.insert (id, name);
return id;
}
@@ -135,13 +135,13 @@ CrateMappings::get_next_crate_num (const std::string
&name)
void
CrateMappings::set_current_crate (CrateNum crateNum)
{
- currentCrateNum = crateNum;
+ current_crate_num = crateNum;
}
CrateNum
CrateMappings::get_current_crate () const
{
- return currentCrateNum;
+ return current_crate_num;
}
tl::optional<CrateNum>
@@ -174,8 +174,8 @@ CrateMappings::lookup_crate_name (const std::string
&crate_name) const
tl::optional<NodeId>
CrateMappings::crate_num_to_nodeid (const CrateNum &crate_num) const
{
- auto it = ast_crate_mappings.find (crate_num);
- if (it == ast_crate_mappings.end ())
+ auto it = ast_crate.find (crate_num);
+ if (it == ast_crate.end ())
return tl::nullopt;
return it->second->get_node_id ();
@@ -233,8 +233,8 @@ Mappings::get_next_localdef_id (CrateNum crateNum)
AST::Crate &
CrateMappings::get_ast_crate (CrateNum crateNum)
{
- auto it = ast_crate_mappings.find (crateNum);
- rust_assert (it != ast_crate_mappings.end ());
+ auto it = ast_crate.find (crateNum);
+ rust_assert (it != ast_crate.end ());
return *it->second;
}
@@ -248,8 +248,8 @@ AST::Crate *
CrateMappings::get_ast_crate_by_node_id_raw (NodeId id)
{
CrateNum crateNum = lookup_crate_num (id).value ();
- auto it = ast_crate_mappings.find (crateNum);
- rust_assert (it != ast_crate_mappings.end ());
+ auto it = ast_crate.find (crateNum);
+ rust_assert (it != ast_crate.end ());
return it->second;
}
@@ -257,16 +257,16 @@ AST::Crate &
CrateMappings::insert_ast_crate (std::unique_ptr<AST::Crate> &&crate,
CrateNum crate_num)
{
- auto it = ast_crate_mappings.find (crate_num);
- rust_assert (it == ast_crate_mappings.end ());
+ auto it = ast_crate.find (crate_num);
+ rust_assert (it == ast_crate.end ());
// store it
crate_node_to_crate_num.insert ({crate->get_node_id (), crate_num});
- ast_crate_mappings.insert ({crate_num, crate.release ()});
+ ast_crate.insert ({crate_num, crate.release ()});
// return the reference to it
- it = ast_crate_mappings.find (crate_num);
- rust_assert (it != ast_crate_mappings.end ());
+ it = ast_crate.find (crate_num);
+ rust_assert (it != ast_crate.end ());
return *it->second;
}
diff --git a/gcc/rust/util/rust-hir-map.h b/gcc/rust/util/rust-hir-map.h
index 4816b648a..5aeb6d924 100644
--- a/gcc/rust/util/rust-hir-map.h
+++ b/gcc/rust/util/rust-hir-map.h
@@ -119,11 +119,11 @@ public:
class CrateMappings
{
- std::map<CrateNum, AST::Crate *> ast_crate_mappings;
+ std::map<CrateNum, AST::Crate *> ast_crate;
- CrateNum crateNumItr;
+ CrateNum crate_num_itr;
- CrateNum currentCrateNum;
+ CrateNum current_crate_num;
std::map<NodeId, CrateNum> crate_node_to_crate_num;
--
2.55.0
