Fix some unused fields in AST visitor

compiler-errors · compiler-errors · commit 6e93ceeb19fb · 2025-06-16T19:51:21.000Z
diff --git a/compiler/rustc_ast/src/mut_visit.rs b/compiler/rustc_ast/src/mut_visit.rs
@@ -37,6 +37,7 @@ mod sealed {
 
     /// This is for compatibility with the regular `Visitor`.
     pub trait MutVisitorResult {
+        #[cfg_attr(not(bootstrap), must_use)]
         type Result: VisitorResult;
     }
 
diff --git a/compiler/rustc_ast/src/visit.rs b/compiler/rustc_ast/src/visit.rs
@@ -130,6 +130,7 @@ pub enum LifetimeCtxt {
 pub trait Visitor<'ast>: Sized {
     /// The result type of the `visit_*` methods. Can be either `()`,
     /// or `ControlFlow<T>`.
+    #[cfg_attr(not(bootstrap), must_use)]
     type Result: VisitorResult = ();
 
     fn visit_ident(&mut self, _ident: &'ast Ident) -> Self::Result {
@@ -884,7 +885,7 @@ macro_rules! common_visitor_and_walkers {
                 TyKind::BareFn(function_declaration) => {
                     let BareFnTy { safety, ext: _, generic_params, decl, decl_span } =
                         &$($mut)? **function_declaration;
-                    visit_safety(vis, safety);
+                    try_visit!(visit_safety(vis, safety));
                     try_visit!(visit_generic_params(vis, generic_params));
                     try_visit!(vis.visit_fn_decl(decl));
                     try_visit!(visit_span(vis, decl_span));
@@ -1235,7 +1236,7 @@ macro_rules! common_visitor_and_walkers {
                     bounds,
                     bound_generic_params,
                 }) => {
-                    visit_generic_params(vis, bound_generic_params);
+                    try_visit!(visit_generic_params(vis, bound_generic_params));
                     try_visit!(vis.visit_ty(bounded_ty));
                     walk_list!(vis, visit_param_bound, bounds, BoundKind::Bound);
                 }
@@ -1420,7 +1421,7 @@ macro_rules! common_visitor_and_walkers {
                     let StructExpr { qself, path, fields, rest } = &$($mut)?**se;
                     try_visit!(vis.visit_qself(qself));
                     try_visit!(vis.visit_path(path));
-                    visit_expr_fields(vis, fields);
+                    try_visit!(visit_expr_fields(vis, fields));
                     match rest {
                         StructRest::Base(expr) => try_visit!(vis.visit_expr(expr)),
                         StructRest::Rest(_span) => {}
diff --git a/compiler/rustc_hir/src/intravisit.rs b/compiler/rustc_hir/src/intravisit.rs
@@ -224,6 +224,7 @@ pub trait Visitor<'v>: Sized {
 
     /// The result type of the `visit_*` methods. Can be either `()`,
     /// or `ControlFlow<T>`.
+    #[cfg_attr(not(bootstrap), must_use)]
     type Result: VisitorResult = ();
 
     /// If `type NestedFilter` is set to visit nested items, this method
diff --git a/compiler/rustc_privacy/src/lib.rs b/compiler/rustc_privacy/src/lib.rs
@@ -67,8 +67,11 @@ impl<'tcx> fmt::Display for LazyDefPathStr<'tcx> {
 /// manually. Second, it doesn't visit some type components like signatures of fn types, or traits
 /// in `impl Trait`, see individual comments in `DefIdVisitorSkeleton::visit_ty`.
 pub trait DefIdVisitor<'tcx> {
+    #[cfg_attr(not(bootstrap), must_use)]
     type Result: VisitorResult = ();
+
     const SHALLOW: bool = false;
+
     fn skip_assoc_tys(&self) -> bool {
         false
     }
diff --git a/compiler/rustc_trait_selection/src/solve/inspect/analyse.rs b/compiler/rustc_trait_selection/src/solve/inspect/analyse.rs
@@ -461,6 +461,7 @@ impl<'a, 'tcx> InspectGoal<'a, 'tcx> {
 
 /// The public API to interact with proof trees.
 pub trait ProofTreeVisitor<'tcx> {
+    #[cfg_attr(not(bootstrap), must_use)]
     type Result: VisitorResult = ();
 
     fn span(&self) -> Span;
diff --git a/compiler/rustc_ty_utils/src/sig_types.rs b/compiler/rustc_ty_utils/src/sig_types.rs
@@ -9,6 +9,7 @@ use rustc_span::Span;
 use tracing::{instrument, trace};
 
 pub trait SpannedTypeVisitor<'tcx> {
+    #[cfg_attr(not(bootstrap), must_use)]
     type Result: VisitorResult = ();
     fn visit(&mut self, span: Span, value: impl TypeVisitable<TyCtxt<'tcx>>) -> Self::Result;
 }
diff --git a/compiler/rustc_type_ir/src/visit.rs b/compiler/rustc_type_ir/src/visit.rs
@@ -89,6 +89,7 @@ pub trait TypeSuperVisitable<I: Interner>: TypeVisitable<I> {
 /// that recurses into the type's fields in a non-custom fashion.
 pub trait TypeVisitor<I: Interner>: Sized {
     #[cfg(feature = "nightly")]
+    #[cfg_attr(not(bootstrap), must_use)]
     type Result: VisitorResult = ();
 
     #[cfg(not(feature = "nightly"))]

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,7 @@ mod sealed {`
`37`	`37`
`38`	`38`	/// This is for compatibility with the regular `Visitor`.
`39`	`39`	`pub trait MutVisitorResult {`
	`40`	`+ #[cfg_attr(not(bootstrap), must_use)]`
`40`	`41`	`type Result: VisitorResult;`
`41`	`42`	`}`
`42`	`43`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ use rustc_span::Span;`
`9`	`9`	`use tracing::{instrument, trace};`
`10`	`10`
`11`	`11`	`pub trait SpannedTypeVisitor<'tcx> {`
	`12`	`+ #[cfg_attr(not(bootstrap), must_use)]`
`12`	`13`	`type Result: VisitorResult = ();`
`13`	`14`	`fn visit(&mut self, span: Span, value: impl TypeVisitable<TyCtxt<'tcx>>) -> Self::Result;`
`14`	`15`	`}`