Skip to content

Commit 189fcd2

Browse files
lucasly-balucasly-ba
committed
gccrs: change unused lint files name to unused
gcc/rust/ChangeLog: * Make-lang.in: Compile the right files. * checks/lints/unused-var/rust-unused-var-checker.cc: Move to... * checks/lints/unused/rust-unused-checker.cc: ...here. * checks/lints/unused-var/rust-unused-var-checker.h: Move to... * checks/lints/unused/rust-unused-checker.h: ...here. * checks/lints/unused-var/rust-unused-var-collector.cc: Move to... * checks/lints/unused/rust-unused-collector.cc: ...here. * checks/lints/unused-var/rust-unused-var-collector.h: Move to... * checks/lints/unused/rust-unused-collector.h: ...here. * checks/lints/unused-var/rust-unused-var-context.cc: Move to... * checks/lints/unused/rust-unused-context.cc: ...here. * checks/lints/unused-var/rust-unused-var-context.h: Move to... * checks/lints/unused/rust-unused-context.h: ...here. * rust-session-manager.cc (Session::compile_crate): Call the right method. Signed-off-by: Lucas Ly Ba <lucas.ly-ba@outlook.com>
1 parent eaafb48 commit 189fcd2

File tree

8 files changed

+50
-54
lines changed

8 files changed

+50
-54
lines changed

‎gcc/rust/Make-lang.in‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -200,9 +200,9 @@ GRS_OBJS = \
200200
rust/rust-const-checker.o \
201201
rust/rust-lint-marklive.o \
202202
rust/rust-lint-unused-var.o \
203-
rust/rust-unused-var-checker.o \
204-
rust/rust-unused-var-collector.o \
205-
rust/rust-unused-var-context.o \
203+
rust/rust-unused-checker.o \
204+
rust/rust-unused-collector.o \
205+
rust/rust-unused-context.o \
206206
rust/rust-readonly-check.o \
207207
rust/rust-hir-type-check-path.o \
208208
rust/rust-unsafe-checker.o \
@@ -435,7 +435,7 @@ RUST_INCLUDES = -I $(srcdir)/rust \
435435
-I $(srcdir)/rust/typecheck \
436436
-I $(srcdir)/rust/checks/lints \
437437
-I $(srcdir)/rust/checks/errors \
438-
-I $(srcdir)/rust/checks/lints/unused-var \
438+
-I $(srcdir)/rust/checks/lints/unused \
439439
-I $(srcdir)/rust/checks/errors/privacy \
440440
-I $(srcdir)/rust/checks/errors/borrowck \
441441
-I $(srcdir)/rust/checks/errors/feature \
@@ -506,8 +506,8 @@ rust/%.o: rust/checks/lints/%.cc
506506
$(COMPILE) $(RUST_CXXFLAGS) $(RUST_INCLUDES) $<
507507
$(POSTCOMPILE)
508508

509-
# build unused variable checking pass files in rust folder
510-
rust/%.o: rust/checks/lints/unused-var/%.cc
509+
# build unused checking pass files in rust folder
510+
rust/%.o: rust/checks/lints/unused/%.cc
511511
$(COMPILE) $(RUST_CXXFLAGS) $(RUST_INCLUDES) $<
512512
$(POSTCOMPILE)
513513

‎gcc/rust/checks/lints/unused-var/rust-unused-var-checker.cc‎ renamed to ‎gcc/rust/checks/lints/unused/rust-unused-checker.cc‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,30 +16,29 @@
1616
// along with GCC; see the file COPYING3. If not see
1717
// <http://www.gnu.org/licenses/>.
1818

19-
#include "rust-unused-var-checker.h"
19+
#include "rust-unused-checker.h"
2020
#include "rust-hir-expr.h"
2121
#include "rust-hir-item.h"
2222

2323
#include "options.h"
2424

2525
namespace Rust {
2626
namespace Analysis {
27-
UnusedVarChecker::UnusedVarChecker ()
27+
UnusedChecker::UnusedChecker ()
2828
: nr_context (
2929
Resolver2_0::ImmutableNameResolutionContext::get ().resolver ()),
30-
mappings (Analysis::Mappings::get ()),
31-
unused_var_context (UnusedVarContext ())
30+
mappings (Analysis::Mappings::get ()), unused_context (UnusedContext ())
3231
{}
3332
void
34-
UnusedVarChecker::go (HIR::Crate &crate)
33+
UnusedChecker::go (HIR::Crate &crate)
3534
{
36-
UnusedVarCollector collector (unused_var_context);
35+
UnusedCollector collector (unused_context);
3736
collector.go (crate);
3837
for (auto &item : crate.get_items ())
3938
item->accept_vis (*this);
4039
}
4140
void
42-
UnusedVarChecker::visit (HIR::ConstantItem &item)
41+
UnusedChecker::visit (HIR::ConstantItem &item)
4342
{
4443
std::string var_name = item.get_identifier ().as_string ();
4544
bool starts_with_under_score = var_name.compare (0, 1, "_") == 0;
@@ -51,36 +50,37 @@ UnusedVarChecker::visit (HIR::ConstantItem &item)
5150
}
5251

5352
void
54-
UnusedVarChecker::visit (HIR::StaticItem &item)
53+
UnusedChecker::visit (HIR::StaticItem &item)
5554
{
5655
std::string var_name = item.get_identifier ().as_string ();
5756
bool starts_with_under_score = var_name.compare (0, 1, "_") == 0;
5857
auto id = item.get_mappings ().get_hirid ();
5958
if (!unused_context.is_variable_used (id) && !starts_with_under_score)
60-
rust_warning_at (item.get_locus (), OPT_Wunused_variable, "unused variable %qs",
59+
rust_warning_at (item.get_locus (), OPT_Wunused_variable,
60+
"unused variable %qs",
6161
item.get_identifier ().as_string ().c_str ());
6262
}
6363

6464
void
65-
UnusedVarChecker::visit (HIR::TraitItemFunc &item)
65+
UnusedChecker::visit (HIR::TraitItemFunc &item)
6666
{
6767
// TODO: check trait item functions if they are not derived.
6868
}
6969
void
70-
UnusedVarChecker::visit (HIR::IdentifierPattern &pattern)
70+
UnusedChecker::visit (HIR::IdentifierPattern &pattern)
7171
{
7272
std::string var_name = pattern.get_identifier ().as_string ();
7373
bool starts_with_under_score = var_name.compare (0, 1, "_") == 0;
7474
auto id = pattern.get_mappings ().get_hirid ();
75-
if (!unused_var_context.is_variable_used (id) && var_name != "self"
75+
if (!unused_context.is_variable_used (id) && var_name != "self"
7676
&& !starts_with_under_score)
7777
rust_warning_at (pattern.get_locus (), OPT_Wunused_variable,
7878
"unused variable %qs",
7979
pattern.get_identifier ().as_string ().c_str ());
8080
}
8181
void
8282

83-
UnusedVarChecker::visit (HIR::AssignmentExpr &expr)
83+
UnusedChecker::visit (HIR::AssignmentExpr &expr)
8484

8585
{
8686
const auto &lhs = expr.get_lhs ();
@@ -90,8 +90,7 @@ UnusedVarChecker::visit (HIR::AssignmentExpr &expr)
9090
NodeId ast_node_id = lhs.get_mappings ().get_nodeid ();
9191
NodeId def_id = nr_context.lookup (ast_node_id).value ();
9292
HirId id = mappings.lookup_node_to_hir (def_id).value ();
93-
if (unused_var_context.is_variable_assigned (id,
94-
lhs.get_mappings ().get_hirid ())
93+
if (unused_context.is_variable_assigned (id, lhs.get_mappings ().get_hirid ())
9594
&& !starts_with_under_score)
9695
rust_warning_at (lhs.get_locus (), OPT_Wunused_variable,
9796
"unused assignment %qs", var_name.c_str ());

‎gcc/rust/checks/lints/unused-var/rust-unused-var-checker.h‎ renamed to ‎gcc/rust/checks/lints/unused/rust-unused-checker.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,21 @@
2020
#include "rust-hir-item.h"
2121
#include "rust-hir-pattern.h"
2222
#include "rust-hir-visitor.h"
23+
#include "rust-unused-collector.h"
2324
#include "rust-immutable-name-resolution-context.h"
24-
#include "rust-unused-var-collector.h"
2525

2626
namespace Rust {
2727
namespace Analysis {
28-
class UnusedVarChecker : public HIR::DefaultHIRVisitor
28+
class UnusedChecker : public HIR::DefaultHIRVisitor
2929
{
3030
public:
31-
UnusedVarChecker ();
31+
UnusedChecker ();
3232
void go (HIR::Crate &crate);
3333

3434
private:
3535
const Resolver2_0::NameResolutionContext &nr_context;
3636
Analysis::Mappings &mappings;
37-
UnusedVarContext unused_var_context;
37+
UnusedContext unused_context;
3838

3939
using HIR::DefaultHIRVisitor::visit;
4040
virtual void visit (HIR::TraitItemFunc &decl) override;

‎gcc/rust/checks/lints/unused-var/rust-unused-var-collector.cc‎ renamed to ‎gcc/rust/checks/lints/unused/rust-unused-collector.cc‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,55 +16,54 @@
1616
// along with GCC; see the file COPYING3. If not see
1717
// <http://www.gnu.org/licenses/>.
1818

19-
#include "rust-unused-var-collector.h"
19+
#include "rust-unused-collector.h"
2020
#include "rust-hir-expr.h"
2121
#include "rust-hir-full-decls.h"
2222
#include "rust-hir-item.h"
2323
#include "rust-hir-path.h"
2424
#include "rust-hir-pattern.h"
2525
#include "rust-immutable-name-resolution-context.h"
26-
#include "tree-check.h"
2726

2827
namespace Rust {
2928
namespace Analysis {
30-
UnusedVarCollector::UnusedVarCollector (UnusedVarContext &context)
29+
UnusedCollector::UnusedCollector (UnusedContext &context)
3130
: nr_context (
3231
Resolver2_0::ImmutableNameResolutionContext::get ().resolver ()),
33-
mappings (Analysis::Mappings::get ()), unused_var_context (context)
32+
mappings (Analysis::Mappings::get ()), unused_context (context)
3433
{}
3534
void
36-
UnusedVarCollector::go (HIR::Crate &crate)
35+
UnusedCollector::go (HIR::Crate &crate)
3736
{
3837
for (auto &item : crate.get_items ())
3938
item->accept_vis (*this);
4039
}
4140

4241
void
43-
UnusedVarCollector::visit (HIR::PathInExpression &expr)
42+
UnusedCollector::visit (HIR::PathInExpression &expr)
4443
{
4544
mark_path_used (expr);
4645
walk (expr);
4746
}
4847

4948
void
50-
UnusedVarCollector::visit (HIR::QualifiedPathInExpression &expr)
49+
UnusedCollector::visit (HIR::QualifiedPathInExpression &expr)
5150
{
5251
mark_path_used (expr);
5352
walk (expr);
5453
}
5554

5655
void
57-
UnusedVarCollector::visit (HIR::StructExprFieldIdentifier &ident)
56+
UnusedCollector::visit (HIR::StructExprFieldIdentifier &ident)
5857
{
5958
mark_path_used (ident);
6059
walk (ident);
6160
}
6261
void
63-
UnusedVarCollector::visit (HIR::AssignmentExpr &expr)
62+
UnusedCollector::visit (HIR::AssignmentExpr &expr)
6463
{
6564
auto def_id = get_def_id (expr.get_lhs ());
6665
HirId id = expr.get_lhs ().get_mappings ().get_hirid ();
67-
unused_var_context.add_assign (def_id, id);
66+
unused_context.add_assign (def_id, id);
6867
visit_outer_attrs (expr);
6968
expr.get_rhs ().accept_vis (*this);
7069
}

‎gcc/rust/checks/lints/unused-var/rust-unused-var-collector.h‎ renamed to ‎gcc/rust/checks/lints/unused/rust-unused-collector.h‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,27 +17,25 @@
1717
// <http://www.gnu.org/licenses/>.
1818

1919
#include "rust-hir-expr.h"
20-
#include "rust-hir-item.h"
2120
#include "rust-hir-path.h"
2221
#include "rust-hir-pattern.h"
2322
#include "rust-hir-visitor.h"
2423
#include "rust-mapping-common.h"
2524
#include "rust-name-resolution-context.h"
26-
#include "rust-unused-var-context.h"
27-
#include "rust-name-resolver.h"
25+
#include "rust-unused-context.h"
2826

2927
namespace Rust {
3028
namespace Analysis {
31-
class UnusedVarCollector : public HIR::DefaultHIRVisitor
29+
class UnusedCollector : public HIR::DefaultHIRVisitor
3230
{
3331
public:
34-
UnusedVarCollector (UnusedVarContext &context);
32+
UnusedCollector (UnusedContext &context);
3533
void go (HIR::Crate &crate);
3634

3735
private:
3836
const Resolver2_0::NameResolutionContext &nr_context;
3937
Analysis::Mappings &mappings;
40-
UnusedVarContext &unused_var_context;
38+
UnusedContext &unused_context;
4139

4240
using HIR::DefaultHIRVisitor::visit;
4341
virtual void visit (HIR::PathInExpression &expr) override;
@@ -56,8 +54,8 @@ class UnusedVarCollector : public HIR::DefaultHIRVisitor
5654
template <typename T> void mark_path_used (T &path_expr)
5755
{
5856
auto def_id = get_def_id (path_expr);
59-
unused_var_context.add_variable (def_id);
60-
unused_var_context.remove_assign (def_id);
57+
unused_context.add_variable (def_id);
58+
unused_context.remove_assign (def_id);
6159
}
6260
};
6361
} // namespace Analysis

‎gcc/rust/checks/lints/unused-var/rust-unused-var-context.cc‎ renamed to ‎gcc/rust/checks/lints/unused/rust-unused-context.cc‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,49 +16,49 @@
1616
// along with GCC; see the file COPYING3. If not see
1717
// <http://www.gnu.org/licenses/>.
1818

19-
#include "rust-unused-var-context.h"
19+
#include "rust-unused-context.h"
2020

2121
namespace Rust {
2222
namespace Analysis {
2323

2424
void
25-
UnusedVarContext::add_variable (HirId id)
25+
UnusedContext::add_variable (HirId id)
2626

2727
{
2828
used_vars.emplace (id);
2929
}
3030

3131
bool
32-
UnusedVarContext::is_variable_used (HirId id) const
32+
UnusedContext::is_variable_used (HirId id) const
3333
{
3434
return used_vars.find (id) != used_vars.end ();
3535
}
3636

3737
void
38-
UnusedVarContext::add_assign (HirId id_def, HirId id)
38+
UnusedContext::add_assign (HirId id_def, HirId id)
3939
{
4040
assigned_vars[id_def].push_back (id);
4141
}
4242

4343
void
44-
UnusedVarContext::remove_assign (HirId id_def)
44+
UnusedContext::remove_assign (HirId id_def)
4545
{
4646
if (assigned_vars.find (id_def) != assigned_vars.end ())
4747
assigned_vars[id_def].pop_back ();
4848
}
4949
bool
50-
UnusedVarContext::is_variable_assigned (HirId id_def, HirId id)
50+
UnusedContext::is_variable_assigned (HirId id_def, HirId id)
5151
{
5252
auto assigned_vec = assigned_vars[id_def];
5353
return std::find (assigned_vec.begin (), assigned_vec.end (), id)
5454
!= assigned_vec.end ();
5555
}
5656

5757
std::string
58-
UnusedVarContext::as_string () const
58+
UnusedContext::as_string () const
5959
{
6060
std::stringstream ss;
61-
ss << "UnusedVarContext: ";
61+
ss << "UnusedContext: ";
6262
for (const auto &v : used_vars)
6363
{
6464
ss << "HirId: " << v << "\n";

‎gcc/rust/checks/lints/unused-var/rust-unused-var-context.h‎ renamed to ‎gcc/rust/checks/lints/unused/rust-unused-context.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
namespace Rust {
2222
namespace Analysis {
2323

24-
class UnusedVarContext
24+
class UnusedContext
2525
{
2626
public:
2727
void add_variable (HirId id);

‎gcc/rust/rust-session-manager.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
#include "rust-cfg-parser.h"
3939
#include "rust-lint-scan-deadcode.h"
4040
#include "rust-lint-unused-var.h"
41-
#include "rust-unused-var-checker.h"
41+
#include "rust-unused-checker.h"
4242
#include "rust-readonly-check.h"
4343
#include "rust-hir-dump.h"
4444
#include "rust-ast-dump.h"
@@ -736,7 +736,7 @@ Session::compile_crate (const char *filename)
736736
Analysis::ScanDeadcode::Scan (hir);
737737

738738
if (flag_unused_check_2_0)
739-
Analysis::UnusedVarChecker ().go (hir);
739+
Analysis::UnusedChecker ().go (hir);
740740
else
741741
Analysis::UnusedVariables::Lint (*ctx);
742742

0 commit comments

Comments
 (0)