20 files changed, 12 insertions, 6 deletions
diff --git a/gcc/rust/Make-lang.in b/gcc/rust/Make-lang.in
index 523680a..d340e36 100644
--- a/gcc/rust/Make-lang.in
+++ b/gcc/rust/Make-lang.in
@@ -303,8 +303,9 @@ RUST_INCLUDES = -I $(srcdir)/rust \
 	-I $(srcdir)/rust/resolve \
 	-I $(srcdir)/rust/util \
 	-I $(srcdir)/rust/typecheck \
-	-I $(srcdir)/rust/privacy \
-	-I $(srcdir)/rust/lint \
+	-I $(srcdir)/rust/checks/lints \
+	-I $(srcdir)/rust/checks/errors \
+	-I $(srcdir)/rust/checks/errors/privacy \
 	-I $(srcdir)/rust/util \
         -I $(srcdir)/rust/metadata
 
@@ -367,13 +368,18 @@ rust/%.o: rust/typecheck/%.cc
 	$(COMPILE) $(RUST_CXXFLAGS) $(RUST_INCLUDES) $<
 	$(POSTCOMPILE)
 
-# build rust/privacy files in rust folder
-rust/%.o: rust/privacy/%.cc
+# build rust/checks/lints files in rust folder
+rust/%.o: rust/checks/lints/%.cc
 	$(COMPILE) $(RUST_CXXFLAGS) $(RUST_INCLUDES) $<
 	$(POSTCOMPILE)
 
-# build rust/lint files in rust folder
-rust/%.o: rust/lint/%.cc
+# build rust/checks/errors files in rust folder
+rust/%.o: rust/checks/errors/%.cc
+	$(COMPILE) $(RUST_CXXFLAGS) $(RUST_INCLUDES) $<
+	$(POSTCOMPILE)
+
+# build privacy pass files in rust folder
+rust/%.o: rust/checks/errors/privacy/%.cc
 	$(COMPILE) $(RUST_CXXFLAGS) $(RUST_INCLUDES) $<
 	$(POSTCOMPILE)
 
diff --git a/gcc/rust/privacy/rust-privacy-check.cc b/gcc/rust/checks/errors/privacy/rust-privacy-check.cc
index 9664d62..9664d62 100644
--- a/gcc/rust/privacy/rust-privacy-check.cc
+++ b/gcc/rust/checks/errors/privacy/rust-privacy-check.cc
diff --git a/gcc/rust/privacy/rust-privacy-check.h b/gcc/rust/checks/errors/privacy/rust-privacy-check.h
index 290b5ea..290b5ea 100644
--- a/gcc/rust/privacy/rust-privacy-check.h
+++ b/gcc/rust/checks/errors/privacy/rust-privacy-check.h
diff --git a/gcc/rust/privacy/rust-privacy-common.h b/gcc/rust/checks/errors/privacy/rust-privacy-common.h
index ceafe91..ceafe91 100644
--- a/gcc/rust/privacy/rust-privacy-common.h
+++ b/gcc/rust/checks/errors/privacy/rust-privacy-common.h
diff --git a/gcc/rust/privacy/rust-privacy-ctx.cc b/gcc/rust/checks/errors/privacy/rust-privacy-ctx.cc
index 9ebc869..9ebc869 100644
--- a/gcc/rust/privacy/rust-privacy-ctx.cc
+++ b/gcc/rust/checks/errors/privacy/rust-privacy-ctx.cc
diff --git a/gcc/rust/privacy/rust-privacy-ctx.h b/gcc/rust/checks/errors/privacy/rust-privacy-ctx.h
index 52d790e..52d790e 100644
--- a/gcc/rust/privacy/rust-privacy-ctx.h
+++ b/gcc/rust/checks/errors/privacy/rust-privacy-ctx.h
diff --git a/gcc/rust/privacy/rust-privacy-reporter.cc b/gcc/rust/checks/errors/privacy/rust-privacy-reporter.cc
index 00d9934..00d9934 100644
--- a/gcc/rust/privacy/rust-privacy-reporter.cc
+++ b/gcc/rust/checks/errors/privacy/rust-privacy-reporter.cc
diff --git a/gcc/rust/privacy/rust-privacy-reporter.h b/gcc/rust/checks/errors/privacy/rust-privacy-reporter.h
index a04e318..a04e318 100644
--- a/gcc/rust/privacy/rust-privacy-reporter.h
+++ b/gcc/rust/checks/errors/privacy/rust-privacy-reporter.h
diff --git a/gcc/rust/privacy/rust-pub-restricted-visitor.cc b/gcc/rust/checks/errors/privacy/rust-pub-restricted-visitor.cc
index e391653..e391653 100644
--- a/gcc/rust/privacy/rust-pub-restricted-visitor.cc
+++ b/gcc/rust/checks/errors/privacy/rust-pub-restricted-visitor.cc
diff --git a/gcc/rust/privacy/rust-pub-restricted-visitor.h b/gcc/rust/checks/errors/privacy/rust-pub-restricted-visitor.h
index 2685f3d..2685f3d 100644
--- a/gcc/rust/privacy/rust-pub-restricted-visitor.h
+++ b/gcc/rust/checks/errors/privacy/rust-pub-restricted-visitor.h
diff --git a/gcc/rust/privacy/rust-reachability.cc b/gcc/rust/checks/errors/privacy/rust-reachability.cc
index b322e29..b322e29 100644
--- a/gcc/rust/privacy/rust-reachability.cc
+++ b/gcc/rust/checks/errors/privacy/rust-reachability.cc
diff --git a/gcc/rust/privacy/rust-reachability.h b/gcc/rust/checks/errors/privacy/rust-reachability.h
index e0bc4f5..e0bc4f5 100644
--- a/gcc/rust/privacy/rust-reachability.h
+++ b/gcc/rust/checks/errors/privacy/rust-reachability.h
diff --git a/gcc/rust/privacy/rust-visibility-resolver.cc b/gcc/rust/checks/errors/privacy/rust-visibility-resolver.cc
index 3011827..3011827 100644
--- a/gcc/rust/privacy/rust-visibility-resolver.cc
+++ b/gcc/rust/checks/errors/privacy/rust-visibility-resolver.cc
diff --git a/gcc/rust/privacy/rust-visibility-resolver.h b/gcc/rust/checks/errors/privacy/rust-visibility-resolver.h
index 20a581c..20a581c 100644
--- a/gcc/rust/privacy/rust-visibility-resolver.h
+++ b/gcc/rust/checks/errors/privacy/rust-visibility-resolver.h
diff --git a/gcc/rust/lint/rust-lint-marklive-base.h b/gcc/rust/checks/lints/rust-lint-marklive-base.h
index 97c0681..97c0681 100644
--- a/gcc/rust/lint/rust-lint-marklive-base.h
+++ b/gcc/rust/checks/lints/rust-lint-marklive-base.h
diff --git a/gcc/rust/lint/rust-lint-marklive.cc b/gcc/rust/checks/lints/rust-lint-marklive.cc
index edc4b71..edc4b71 100644
--- a/gcc/rust/lint/rust-lint-marklive.cc
+++ b/gcc/rust/checks/lints/rust-lint-marklive.cc
diff --git a/gcc/rust/lint/rust-lint-marklive.h b/gcc/rust/checks/lints/rust-lint-marklive.h
index ef37e17..ef37e17 100644
--- a/gcc/rust/lint/rust-lint-marklive.h
+++ b/gcc/rust/checks/lints/rust-lint-marklive.h
diff --git a/gcc/rust/lint/rust-lint-scan-deadcode.h b/gcc/rust/checks/lints/rust-lint-scan-deadcode.h
index 591cb30..591cb30 100644
--- a/gcc/rust/lint/rust-lint-scan-deadcode.h
+++ b/gcc/rust/checks/lints/rust-lint-scan-deadcode.h
diff --git a/gcc/rust/lint/rust-lint-unused-var.cc b/gcc/rust/checks/lints/rust-lint-unused-var.cc
index d4317e5..d4317e5 100644
--- a/gcc/rust/lint/rust-lint-unused-var.cc
+++ b/gcc/rust/checks/lints/rust-lint-unused-var.cc
diff --git a/gcc/rust/lint/rust-lint-unused-var.h b/gcc/rust/checks/lints/rust-lint-unused-var.h
index 6fabfef..6fabfef 100644
--- a/gcc/rust/lint/rust-lint-unused-var.h
+++ b/gcc/rust/checks/lints/rust-lint-unused-var.h