Skip to content

Commit 5abfb37

Browse files
JarchoJarcho
committed
Move visitor utils to rustc_ast_ir 
1 parent c7beecf commit 5abfb37

File tree

12 files changed

+99
-79
lines changed

12 files changed

+99
-79
lines changed

‎compiler/rustc_ast/src/visit.rs

+3-65
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,12 @@
1515
1616
use crate::ast::*;
1717

18-
use core::ops::ControlFlow;
19-
2018
use rustc_span::symbol::Ident;
2119
use rustc_span::Span;
2220

21+
pub use rustc_ast_ir::visit::VisitorResult;
22+
pub use rustc_ast_ir::{try_visit, visit_opt, walk_list, walk_visitable_list};
23+
2324
#[derive(Copy, Clone, Debug, PartialEq)]
2425
pub enum AssocCtxt {
2526
Trait,
@@ -101,51 +102,6 @@ pub enum LifetimeCtxt {
101102
GenericArg,
102103
}
103104

104-
/// Similar to the `Try` trait, but also implemented for `()`.
105-
pub trait VisitorResult {
106-
type Residual;
107-
fn output() -> Self;
108-
fn from_residual(residual: Self::Residual) -> Self;
109-
fn branch(self) -> ControlFlow<Self::Residual>;
110-
}
111-
112-
impl VisitorResult for () {
113-
type Residual = !;
114-
115-
fn output() -> Self {}
116-
fn from_residual(_: !) -> Self {}
117-
fn branch(self) -> ControlFlow<!> {
118-
ControlFlow::Continue(())
119-
}
120-
}
121-
122-
impl<T> VisitorResult for ControlFlow<T> {
123-
type Residual = T;
124-
125-
fn output() -> Self {
126-
ControlFlow::Continue(())
127-
}
128-
fn from_residual(residual: Self::Residual) -> Self {
129-
ControlFlow::Break(residual)
130-
}
131-
fn branch(self) -> ControlFlow<T> {
132-
self
133-
}
134-
}
135-
136-
#[macro_export]
137-
macro_rules! try_visit {
138-
($e:expr) => {
139-
match $crate::visit::VisitorResult::branch($e) {
140-
core::ops::ControlFlow::Continue(()) => (),
141-
#[allow(unreachable_code)]
142-
core::ops::ControlFlow::Break(r) => {
143-
return $crate::visit::VisitorResult::from_residual(r);
144-
}
145-
}
146-
};
147-
}
148-
149105
/// Each method of the `Visitor` trait is a hook to be potentially
150106
/// overridden. Each method's default implementation recursively visits
151107
/// the substructure of the input via the corresponding `walk` method;
@@ -316,24 +272,6 @@ pub trait Visitor<'ast>: Sized {
316272
}
317273
}
318274

319-
#[macro_export]
320-
macro_rules! walk_list {
321-
($visitor: expr, $method: ident, $list: expr $(, $($extra_args: expr),* )?) => {
322-
for elem in $list {
323-
$crate::try_visit!($visitor.$method(elem $(, $($extra_args,)* )?));
324-
}
325-
}
326-
}
327-
328-
#[macro_export]
329-
macro_rules! visit_opt {
330-
($visitor: expr, $method: ident, $opt: expr $(, $($extra_args: expr),* )?) => {
331-
if let Some(x) = $opt {
332-
$crate::try_visit!($visitor.$method(x $(, $($extra_args,)* )?));
333-
}
334-
}
335-
}
336-
337275
pub fn walk_crate<'a, V: Visitor<'a>>(visitor: &mut V, krate: &'a Crate) -> V::Result {
338276
walk_list!(visitor, visit_item, &krate.items);
339277
walk_list!(visitor, visit_attribute, &krate.attrs);

‎compiler/rustc_ast_ir/src/lib.rs

+3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
1+
#![cfg_attr(feature = "nightly", feature(never_type))]
12
#![cfg_attr(feature = "nightly", feature(rustc_attrs))]
23
#![cfg_attr(feature = "nightly", allow(internal_features))]
34

45
#[cfg(feature = "nightly")]
56
#[macro_use]
67
extern crate rustc_macros;
78

9+
pub mod visit;
10+
811
/// The movability of a coroutine / closure literal:
912
/// whether a coroutine contains self-references, causing it to be `!Unpin`.
1013
#[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Debug, Copy)]

‎compiler/rustc_ast_ir/src/visit.rs

+82
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
use core::ops::ControlFlow;
2+
3+
/// Similar to the `Try` trait, but also implemented for `()`.
4+
pub trait VisitorResult {
5+
type Residual;
6+
fn output() -> Self;
7+
fn from_residual(residual: Self::Residual) -> Self;
8+
fn from_branch(b: ControlFlow<Self::Residual>) -> Self;
9+
fn branch(self) -> ControlFlow<Self::Residual>;
10+
}
11+
12+
impl VisitorResult for () {
13+
#[cfg(feature = "nightly")]
14+
type Residual = !;
15+
16+
#[cfg(not(feature = "nightly"))]
17+
type Residual = core::ops::Infallible;
18+
19+
fn output() -> Self {}
20+
fn from_residual(_: Self::Residual) -> Self {}
21+
fn from_branch(_: ControlFlow<Self::Residual>) -> Self {}
22+
fn branch(self) -> ControlFlow<Self::Residual> {
23+
ControlFlow::Continue(())
24+
}
25+
}
26+
27+
impl<T> VisitorResult for ControlFlow<T> {
28+
type Residual = T;
29+
30+
fn output() -> Self {
31+
ControlFlow::Continue(())
32+
}
33+
fn from_residual(residual: Self::Residual) -> Self {
34+
ControlFlow::Break(residual)
35+
}
36+
fn from_branch(b: Self) -> Self {
37+
b
38+
}
39+
fn branch(self) -> Self {
40+
self
41+
}
42+
}
43+
44+
#[macro_export]
45+
macro_rules! try_visit {
46+
($e:expr) => {
47+
match $crate::visit::VisitorResult::branch($e) {
48+
core::ops::ControlFlow::Continue(()) => (),
49+
#[allow(unreachable_code)]
50+
core::ops::ControlFlow::Break(r) => {
51+
return $crate::visit::VisitorResult::from_residual(r);
52+
}
53+
}
54+
};
55+
}
56+
57+
#[macro_export]
58+
macro_rules! visit_opt {
59+
($visitor: expr, $method: ident, $opt: expr $(, $($extra_args: expr),* )?) => {
60+
if let Some(x) = $opt {
61+
$crate::try_visit!($visitor.$method(x $(, $($extra_args,)* )?));
62+
}
63+
}
64+
}
65+
66+
#[macro_export]
67+
macro_rules! walk_list {
68+
($visitor: expr, $method: ident, $list: expr $(, $($extra_args: expr),* )?) => {
69+
for elem in $list {
70+
$crate::try_visit!($visitor.$method(elem $(, $($extra_args,)* )?));
71+
}
72+
}
73+
}
74+
75+
#[macro_export]
76+
macro_rules! walk_visitable_list {
77+
($visitor: expr, $list: expr $(, $($extra_args: expr),* )?) => {
78+
for elem in $list {
79+
$crate::try_visit!(elem.visit_with($visitor $(, $($extra_args,)* )?));
80+
}
81+
}
82+
}

‎compiler/rustc_ast_passes/src/ast_validation.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88

99
use itertools::{Either, Itertools};
1010
use rustc_ast::ptr::P;
11-
use rustc_ast::visit::{AssocCtxt, BoundKind, FnCtxt, FnKind, Visitor};
12-
use rustc_ast::walk_list;
11+
use rustc_ast::visit::{walk_list, AssocCtxt, BoundKind, FnCtxt, FnKind, Visitor};
1312
use rustc_ast::*;
1413
use rustc_ast_pretty::pprust::{self, State};
1514
use rustc_data_structures::fx::FxIndexMap;

‎compiler/rustc_builtin_macros/src/deriving/default.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ use crate::deriving::generic::ty::*;
22
use crate::deriving::generic::*;
33
use crate::errors;
44
use rustc_ast as ast;
5-
use rustc_ast::{attr, walk_list, EnumDef, VariantData};
5+
use rustc_ast::visit::walk_list;
6+
use rustc_ast::{attr, EnumDef, VariantData};
67
use rustc_expand::base::{Annotatable, DummyResult, ExtCtxt};
78
use rustc_span::symbol::Ident;
89
use rustc_span::symbol::{kw, sym};

‎compiler/rustc_expand/src/expand.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ use rustc_ast::mut_visit::*;
1414
use rustc_ast::ptr::P;
1515
use rustc_ast::token::{self, Delimiter};
1616
use rustc_ast::tokenstream::TokenStream;
17-
use rustc_ast::visit::{self, AssocCtxt, Visitor, VisitorResult};
18-
use rustc_ast::{try_visit, walk_list};
17+
use rustc_ast::visit::{self, try_visit, walk_list, AssocCtxt, Visitor, VisitorResult};
1918
use rustc_ast::{AssocItemKind, AstNodeWrapper, AttrArgs, AttrStyle, AttrVec, ExprKind};
2019
use rustc_ast::{ForeignItemKind, HasAttrs, HasNodeId};
2120
use rustc_ast::{Inline, ItemKind, MacStmtStyle, MetaItemKind, ModKind};

‎compiler/rustc_hir/src/intravisit.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,7 @@
6565
//! example coroutine inference, and possibly also HIR borrowck.
6666
6767
use crate::hir::*;
68-
use rustc_ast::visit::VisitorResult;
69-
use rustc_ast::{try_visit, visit_opt, walk_list};
68+
use rustc_ast::visit::{try_visit, visit_opt, walk_list, VisitorResult};
7069
use rustc_ast::{Attribute, Label};
7170
use rustc_span::def_id::LocalDefId;
7271
use rustc_span::symbol::{Ident, Symbol};

‎compiler/rustc_hir_analysis/src/check/region.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
//!
77
//! [rustc dev guide]: https://rustc-dev-guide.rust-lang.org/borrow_check.html
88
9-
use rustc_ast::walk_list;
9+
use rustc_ast::visit::walk_list;
1010
use rustc_data_structures::fx::FxHashSet;
1111
use rustc_hir as hir;
1212
use rustc_hir::def_id::DefId;

‎compiler/rustc_hir_analysis/src/collect/resolve_bound_vars.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
//! the types in HIR to identify late-bound lifetimes and assign their Debruijn indices. This file
77
//! is also responsible for assigning their semantics to implicit lifetimes in trait objects.
88
9-
use rustc_ast::walk_list;
9+
use rustc_ast::visit::walk_list;
1010
use rustc_data_structures::fx::{FxHashSet, FxIndexMap, FxIndexSet};
1111
use rustc_errors::{codes::*, struct_span_code_err};
1212
use rustc_hir as hir;

‎compiler/rustc_lint/src/early.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
use crate::context::{EarlyContext, LintContext, LintStore};
1818
use crate::passes::{EarlyLintPass, EarlyLintPassObject};
1919
use rustc_ast::ptr::P;
20-
use rustc_ast::visit::{self as ast_visit, Visitor};
21-
use rustc_ast::{self as ast, walk_list, HasAttrs};
20+
use rustc_ast::visit::{self as ast_visit, walk_list, Visitor};
21+
use rustc_ast::{self as ast, HasAttrs};
2222
use rustc_data_structures::stack::ensure_sufficient_stack;
2323
use rustc_feature::Features;
2424
use rustc_middle::ty::RegisteredTools;

‎compiler/rustc_middle/src/hir/map/mod.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ use crate::middle::debugger_visualizer::DebuggerVisualizerFile;
33
use crate::query::LocalCrate;
44
use crate::ty::TyCtxt;
55
use rustc_ast as ast;
6-
use rustc_ast::visit::VisitorResult;
7-
use rustc_ast::walk_list;
6+
use rustc_ast::visit::{walk_list, VisitorResult};
87
use rustc_data_structures::fingerprint::Fingerprint;
98
use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
109
use rustc_data_structures::svh::Svh;

‎compiler/rustc_resolve/src/late.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use crate::{Module, ModuleOrUniformRoot, NameBinding, ParentScope, PathResult};
1313
use crate::{ResolutionError, Resolver, Segment, UseError};
1414

1515
use rustc_ast::ptr::P;
16-
use rustc_ast::visit::{AssocCtxt, BoundKind, FnCtxt, FnKind, Visitor};
16+
use rustc_ast::visit::{walk_list, AssocCtxt, BoundKind, FnCtxt, FnKind, Visitor};
1717
use rustc_ast::*;
1818
use rustc_data_structures::fx::{FxHashMap, FxHashSet, FxIndexMap};
1919
use rustc_errors::{

0 commit comments

Comments
 (0)