Skip to content

Commit 317f832

Browse files
eggyaleggyal
committed
Rename Visitor to TypeVisitor
1 parent 869fa24 commit 317f832

File tree

13 files changed

+69
-69
lines changed

13 files changed

+69
-69
lines changed

‎chalk-derive/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ fn derive_any_type_visitable(
183183
quote! {
184184
fn #method_name <B>(
185185
&self,
186-
visitor: &mut dyn ::chalk_ir::visit::Visitor < #interner, BreakTy = B >,
186+
visitor: &mut dyn ::chalk_ir::visit::TypeVisitor < #interner, BreakTy = B >,
187187
outer_binder: ::chalk_ir::DebruijnIndex,
188188
) -> std::ops::ControlFlow<B> {
189189
match *self {

‎chalk-ir/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ extern crate self as chalk_ir;
99
use crate::cast::{Cast, CastTo, Caster};
1010
use crate::fold::shift::Shift;
1111
use crate::fold::{Subst, TypeFoldable, TypeFolder, TypeSuperFoldable};
12-
use crate::visit::{TypeSuperVisitable, TypeVisitable, VisitExt, Visitor};
12+
use crate::visit::{TypeSuperVisitable, TypeVisitable, TypeVisitor, VisitExt};
1313
use chalk_derive::{HasInterner, TypeFoldable, TypeSuperVisitable, TypeVisitable, Zip};
1414
use std::marker::PhantomData;
1515
use std::ops::ControlFlow;

‎chalk-ir/src/visit.rs

+17-17
Original file line numberDiff line numberDiff line change
@@ -35,19 +35,19 @@ macro_rules! try_break {
3535
/// ```rust,ignore
3636
/// let result = x.visit_with(&mut visitor, 0);
3737
/// ```
38-
pub trait Visitor<I: Interner> {
38+
pub trait TypeVisitor<I: Interner> {
3939
/// The "break type" of the visitor, often `()`. It represents the result
4040
/// the visitor yields when it stops visiting.
4141
type BreakTy;
4242

4343
/// Creates a `dyn` value from this visitor. Unfortunately, this
4444
/// must be added manually to each impl of visitor; it permits the
45-
/// default implements below to create a `&mut dyn Visitor` from
45+
/// default implements below to create a `&mut dyn TypeVisitor` from
4646
/// `Self` without knowing what `Self` is (by invoking this
4747
/// method). Effectively, this limits impls of `visitor` to types
4848
/// for which we are able to create a dyn value (i.e., not `[T]`
4949
/// types).
50-
fn as_dyn(&mut self) -> &mut dyn Visitor<I, BreakTy = Self::BreakTy>;
50+
fn as_dyn(&mut self) -> &mut dyn TypeVisitor<I, BreakTy = Self::BreakTy>;
5151

5252
/// Top-level callback: invoked for each `Ty<I>` that is
5353
/// encountered when visiting. By default, invokes
@@ -187,7 +187,7 @@ pub trait Visitor<I: Interner> {
187187
}
188188

189189
/// Applies the given `visitor` to a value, producing a visited result
190-
/// of type `Visitor::Result`.
190+
/// of type `TypeVisitor::Result`.
191191
pub trait TypeVisitable<I: Interner>: Debug {
192192
/// Apply the given visitor `visitor` to `self`; `binders` is the
193193
/// number of binders that are in scope when beginning the
@@ -196,7 +196,7 @@ pub trait TypeVisitable<I: Interner>: Debug {
196196
/// constructs.
197197
fn visit_with<B>(
198198
&self,
199-
visitor: &mut dyn Visitor<I, BreakTy = B>,
199+
visitor: &mut dyn TypeVisitor<I, BreakTy = B>,
200200
outer_binder: DebruijnIndex,
201201
) -> ControlFlow<B>;
202202
}
@@ -208,7 +208,7 @@ pub trait TypeSuperVisitable<I: Interner>: TypeVisitable<I> {
208208
/// Recursively visits the type contents.
209209
fn super_visit_with<B>(
210210
&self,
211-
visitor: &mut dyn Visitor<I, BreakTy = B>,
211+
visitor: &mut dyn TypeVisitor<I, BreakTy = B>,
212212
outer_binder: DebruijnIndex,
213213
) -> ControlFlow<B>;
214214
}
@@ -219,7 +219,7 @@ pub trait TypeSuperVisitable<I: Interner>: TypeVisitable<I> {
219219
impl<I: Interner> TypeVisitable<I> for Ty<I> {
220220
fn visit_with<B>(
221221
&self,
222-
visitor: &mut dyn Visitor<I, BreakTy = B>,
222+
visitor: &mut dyn TypeVisitor<I, BreakTy = B>,
223223
outer_binder: DebruijnIndex,
224224
) -> ControlFlow<B> {
225225
visitor.visit_ty(self, outer_binder)
@@ -233,7 +233,7 @@ where
233233
{
234234
fn super_visit_with<B>(
235235
&self,
236-
visitor: &mut dyn Visitor<I, BreakTy = B>,
236+
visitor: &mut dyn TypeVisitor<I, BreakTy = B>,
237237
outer_binder: DebruijnIndex,
238238
) -> ControlFlow<B> {
239239
let interner = visitor.interner();
@@ -304,7 +304,7 @@ where
304304
impl<I: Interner> TypeVisitable<I> for Lifetime<I> {
305305
fn visit_with<B>(
306306
&self,
307-
visitor: &mut dyn Visitor<I, BreakTy = B>,
307+
visitor: &mut dyn TypeVisitor<I, BreakTy = B>,
308308
outer_binder: DebruijnIndex,
309309
) -> ControlFlow<B> {
310310
visitor.visit_lifetime(self, outer_binder)
@@ -314,7 +314,7 @@ impl<I: Interner> TypeVisitable<I> for Lifetime<I> {
314314
impl<I: Interner> TypeSuperVisitable<I> for Lifetime<I> {
315315
fn super_visit_with<B>(
316316
&self,
317-
visitor: &mut dyn Visitor<I, BreakTy = B>,
317+
visitor: &mut dyn TypeVisitor<I, BreakTy = B>,
318318
outer_binder: DebruijnIndex,
319319
) -> ControlFlow<B> {
320320
let interner = visitor.interner();
@@ -341,7 +341,7 @@ impl<I: Interner> TypeSuperVisitable<I> for Lifetime<I> {
341341
impl<I: Interner> TypeVisitable<I> for Const<I> {
342342
fn visit_with<B>(
343343
&self,
344-
visitor: &mut dyn Visitor<I, BreakTy = B>,
344+
visitor: &mut dyn TypeVisitor<I, BreakTy = B>,
345345
outer_binder: DebruijnIndex,
346346
) -> ControlFlow<B> {
347347
visitor.visit_const(self, outer_binder)
@@ -351,7 +351,7 @@ impl<I: Interner> TypeVisitable<I> for Const<I> {
351351
impl<I: Interner> TypeSuperVisitable<I> for Const<I> {
352352
fn super_visit_with<B>(
353353
&self,
354-
visitor: &mut dyn Visitor<I, BreakTy = B>,
354+
visitor: &mut dyn TypeVisitor<I, BreakTy = B>,
355355
outer_binder: DebruijnIndex,
356356
) -> ControlFlow<B> {
357357
let interner = visitor.interner();
@@ -375,7 +375,7 @@ impl<I: Interner> TypeSuperVisitable<I> for Const<I> {
375375
impl<I: Interner> TypeVisitable<I> for Goal<I> {
376376
fn visit_with<B>(
377377
&self,
378-
visitor: &mut dyn Visitor<I, BreakTy = B>,
378+
visitor: &mut dyn TypeVisitor<I, BreakTy = B>,
379379
outer_binder: DebruijnIndex,
380380
) -> ControlFlow<B> {
381381
visitor.visit_goal(self, outer_binder)
@@ -385,7 +385,7 @@ impl<I: Interner> TypeVisitable<I> for Goal<I> {
385385
impl<I: Interner> TypeSuperVisitable<I> for Goal<I> {
386386
fn super_visit_with<B>(
387387
&self,
388-
visitor: &mut dyn Visitor<I, BreakTy = B>,
388+
visitor: &mut dyn TypeVisitor<I, BreakTy = B>,
389389
outer_binder: DebruijnIndex,
390390
) -> ControlFlow<B> {
391391
let interner = visitor.interner();
@@ -396,7 +396,7 @@ impl<I: Interner> TypeSuperVisitable<I> for Goal<I> {
396396
impl<I: Interner> TypeVisitable<I> for ProgramClause<I> {
397397
fn visit_with<B>(
398398
&self,
399-
visitor: &mut dyn Visitor<I, BreakTy = B>,
399+
visitor: &mut dyn TypeVisitor<I, BreakTy = B>,
400400
outer_binder: DebruijnIndex,
401401
) -> ControlFlow<B> {
402402
visitor.visit_program_clause(self, outer_binder)
@@ -406,7 +406,7 @@ impl<I: Interner> TypeVisitable<I> for ProgramClause<I> {
406406
impl<I: Interner> TypeVisitable<I> for WhereClause<I> {
407407
fn visit_with<B>(
408408
&self,
409-
visitor: &mut dyn Visitor<I, BreakTy = B>,
409+
visitor: &mut dyn TypeVisitor<I, BreakTy = B>,
410410
outer_binder: DebruijnIndex,
411411
) -> ControlFlow<B> {
412412
visitor.visit_where_clause(self, outer_binder)
@@ -416,7 +416,7 @@ impl<I: Interner> TypeVisitable<I> for WhereClause<I> {
416416
impl<I: Interner> TypeVisitable<I> for DomainGoal<I> {
417417
fn visit_with<B>(
418418
&self,
419-
visitor: &mut dyn Visitor<I, BreakTy = B>,
419+
visitor: &mut dyn TypeVisitor<I, BreakTy = B>,
420420
outer_binder: DebruijnIndex,
421421
) -> ControlFlow<B> {
422422
visitor.visit_domain_goal(self, outer_binder)

‎chalk-ir/src/visit/binder_impls.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
66
use crate::interner::HasInterner;
77
use crate::{
8-
Binders, Canonical, ControlFlow, DebruijnIndex, FnPointer, Interner, TypeVisitable, Visitor,
8+
Binders, Canonical, ControlFlow, DebruijnIndex, FnPointer, Interner, TypeVisitable, TypeVisitor,
99
};
1010

1111
impl<I: Interner> TypeVisitable<I> for FnPointer<I> {
1212
fn visit_with<B>(
1313
&self,
14-
visitor: &mut dyn Visitor<I, BreakTy = B>,
14+
visitor: &mut dyn TypeVisitor<I, BreakTy = B>,
1515
outer_binder: DebruijnIndex,
1616
) -> ControlFlow<B> {
1717
self.substitution
@@ -25,7 +25,7 @@ where
2525
{
2626
fn visit_with<B>(
2727
&self,
28-
visitor: &mut dyn Visitor<I, BreakTy = B>,
28+
visitor: &mut dyn TypeVisitor<I, BreakTy = B>,
2929
outer_binder: DebruijnIndex,
3030
) -> ControlFlow<B> {
3131
self.value.visit_with(visitor, outer_binder.shifted_in())
@@ -39,7 +39,7 @@ where
3939
{
4040
fn visit_with<B>(
4141
&self,
42-
visitor: &mut dyn Visitor<I, BreakTy = B>,
42+
visitor: &mut dyn TypeVisitor<I, BreakTy = B>,
4343
outer_binder: DebruijnIndex,
4444
) -> ControlFlow<B> {
4545
self.value.visit_with(visitor, outer_binder.shifted_in())

‎chalk-ir/src/visit/boring_impls.rs

+19-19
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ use crate::{
99
DebruijnIndex, FloatTy, FnDefId, ForeignDefId, GeneratorId, GenericArg, Goals, ImplId, IntTy,
1010
Interner, Mutability, OpaqueTyId, PlaceholderIndex, ProgramClause, ProgramClauses,
1111
QuantifiedWhereClauses, QuantifierKind, Safety, Scalar, Substitution, TraitId,
12-
TypeSuperVisitable, TypeVisitable, UintTy, UniverseIndex, Visitor,
12+
TypeSuperVisitable, TypeVisitable, TypeVisitor, UintTy, UniverseIndex,
1313
};
1414
use std::{marker::PhantomData, sync::Arc};
1515

1616
/// Convenience function to visit all the items in the iterator it.
1717
pub fn visit_iter<'i, T, I, B>(
1818
it: impl Iterator<Item = T>,
19-
visitor: &mut dyn Visitor<I, BreakTy = B>,
19+
visitor: &mut dyn TypeVisitor<I, BreakTy = B>,
2020
outer_binder: DebruijnIndex,
2121
) -> ControlFlow<B>
2222
where
@@ -32,7 +32,7 @@ where
3232
impl<T: TypeVisitable<I>, I: Interner> TypeVisitable<I> for &T {
3333
fn visit_with<B>(
3434
&self,
35-
visitor: &mut dyn Visitor<I, BreakTy = B>,
35+
visitor: &mut dyn TypeVisitor<I, BreakTy = B>,
3636
outer_binder: DebruijnIndex,
3737
) -> ControlFlow<B> {
3838
T::visit_with(self, visitor, outer_binder)
@@ -42,7 +42,7 @@ impl<T: TypeVisitable<I>, I: Interner> TypeVisitable<I> for &T {
4242
impl<T: TypeVisitable<I>, I: Interner> TypeVisitable<I> for Vec<T> {
4343
fn visit_with<B>(
4444
&self,
45-
visitor: &mut dyn Visitor<I, BreakTy = B>,
45+
visitor: &mut dyn TypeVisitor<I, BreakTy = B>,
4646
outer_binder: DebruijnIndex,
4747
) -> ControlFlow<B> {
4848
visit_iter(self.iter(), visitor, outer_binder)
@@ -52,7 +52,7 @@ impl<T: TypeVisitable<I>, I: Interner> TypeVisitable<I> for Vec<T> {
5252
impl<T: TypeVisitable<I>, I: Interner> TypeVisitable<I> for &[T] {
5353
fn visit_with<B>(
5454
&self,
55-
visitor: &mut dyn Visitor<I, BreakTy = B>,
55+
visitor: &mut dyn TypeVisitor<I, BreakTy = B>,
5656
outer_binder: DebruijnIndex,
5757
) -> ControlFlow<B> {
5858
visit_iter(self.iter(), visitor, outer_binder)
@@ -62,7 +62,7 @@ impl<T: TypeVisitable<I>, I: Interner> TypeVisitable<I> for &[T] {
6262
impl<T: TypeVisitable<I>, I: Interner> TypeVisitable<I> for Box<T> {
6363
fn visit_with<B>(
6464
&self,
65-
visitor: &mut dyn Visitor<I, BreakTy = B>,
65+
visitor: &mut dyn TypeVisitor<I, BreakTy = B>,
6666
outer_binder: DebruijnIndex,
6767
) -> ControlFlow<B> {
6868
T::visit_with(self, visitor, outer_binder)
@@ -72,7 +72,7 @@ impl<T: TypeVisitable<I>, I: Interner> TypeVisitable<I> for Box<T> {
7272
impl<T: TypeVisitable<I>, I: Interner> TypeVisitable<I> for Arc<T> {
7373
fn visit_with<B>(
7474
&self,
75-
visitor: &mut dyn Visitor<I, BreakTy = B>,
75+
visitor: &mut dyn TypeVisitor<I, BreakTy = B>,
7676
outer_binder: DebruijnIndex,
7777
) -> ControlFlow<B> {
7878
T::visit_with(self, visitor, outer_binder)
@@ -82,7 +82,7 @@ impl<T: TypeVisitable<I>, I: Interner> TypeVisitable<I> for Arc<T> {
8282
macro_rules! tuple_visit {
8383
($($n:ident),*) => {
8484
impl<$($n: TypeVisitable<I>,)* I: Interner> TypeVisitable<I> for ($($n,)*) {
85-
fn visit_with<BT>(&self, visitor: &mut dyn Visitor<I, BreakTy = BT>, outer_binder: DebruijnIndex) -> ControlFlow<BT> {
85+
fn visit_with<BT>(&self, visitor: &mut dyn TypeVisitor<I, BreakTy = BT>, outer_binder: DebruijnIndex) -> ControlFlow<BT> {
8686
#[allow(non_snake_case)]
8787
let &($(ref $n),*) = self;
8888
$(
@@ -102,7 +102,7 @@ tuple_visit!(A, B, C, D, E);
102102
impl<T: TypeVisitable<I>, I: Interner> TypeVisitable<I> for Option<T> {
103103
fn visit_with<B>(
104104
&self,
105-
visitor: &mut dyn Visitor<I, BreakTy = B>,
105+
visitor: &mut dyn TypeVisitor<I, BreakTy = B>,
106106
outer_binder: DebruijnIndex,
107107
) -> ControlFlow<B> {
108108
match self {
@@ -115,7 +115,7 @@ impl<T: TypeVisitable<I>, I: Interner> TypeVisitable<I> for Option<T> {
115115
impl<I: Interner> TypeVisitable<I> for GenericArg<I> {
116116
fn visit_with<B>(
117117
&self,
118-
visitor: &mut dyn Visitor<I, BreakTy = B>,
118+
visitor: &mut dyn TypeVisitor<I, BreakTy = B>,
119119
outer_binder: DebruijnIndex,
120120
) -> ControlFlow<B> {
121121
let interner = visitor.interner();
@@ -126,7 +126,7 @@ impl<I: Interner> TypeVisitable<I> for GenericArg<I> {
126126
impl<I: Interner> TypeVisitable<I> for Substitution<I> {
127127
fn visit_with<B>(
128128
&self,
129-
visitor: &mut dyn Visitor<I, BreakTy = B>,
129+
visitor: &mut dyn TypeVisitor<I, BreakTy = B>,
130130
outer_binder: DebruijnIndex,
131131
) -> ControlFlow<B> {
132132
let interner = visitor.interner();
@@ -137,7 +137,7 @@ impl<I: Interner> TypeVisitable<I> for Substitution<I> {
137137
impl<I: Interner> TypeVisitable<I> for Goals<I> {
138138
fn visit_with<B>(
139139
&self,
140-
visitor: &mut dyn Visitor<I, BreakTy = B>,
140+
visitor: &mut dyn TypeVisitor<I, BreakTy = B>,
141141
outer_binder: DebruijnIndex,
142142
) -> ControlFlow<B> {
143143
let interner = visitor.interner();
@@ -152,7 +152,7 @@ macro_rules! const_visit {
152152
impl<I: Interner> $crate::visit::TypeVisitable<I> for $t {
153153
fn visit_with<B>(
154154
&self,
155-
_visitor: &mut dyn ($crate::visit::Visitor<I, BreakTy = B>),
155+
_visitor: &mut dyn ($crate::visit::TypeVisitor<I, BreakTy = B>),
156156
_outer_binder: DebruijnIndex,
157157
) -> ControlFlow<B> {
158158
ControlFlow::Continue(())
@@ -183,7 +183,7 @@ macro_rules! id_visit {
183183
impl<I: Interner> $crate::visit::TypeVisitable<I> for $t<I> {
184184
fn visit_with<B>(
185185
&self,
186-
_visitor: &mut dyn ($crate::visit::Visitor<I, BreakTy = B>),
186+
_visitor: &mut dyn ($crate::visit::TypeVisitor<I, BreakTy = B>),
187187
_outer_binder: DebruijnIndex,
188188
) -> ControlFlow<B> {
189189
ControlFlow::Continue(())
@@ -205,7 +205,7 @@ id_visit!(ForeignDefId);
205205
impl<I: Interner> TypeSuperVisitable<I> for ProgramClause<I> {
206206
fn super_visit_with<B>(
207207
&self,
208-
visitor: &mut dyn Visitor<I, BreakTy = B>,
208+
visitor: &mut dyn TypeVisitor<I, BreakTy = B>,
209209
outer_binder: DebruijnIndex,
210210
) -> ControlFlow<B> {
211211
let interner = visitor.interner();
@@ -217,7 +217,7 @@ impl<I: Interner> TypeSuperVisitable<I> for ProgramClause<I> {
217217
impl<I: Interner> TypeVisitable<I> for ProgramClauses<I> {
218218
fn visit_with<B>(
219219
&self,
220-
visitor: &mut dyn Visitor<I, BreakTy = B>,
220+
visitor: &mut dyn TypeVisitor<I, BreakTy = B>,
221221
outer_binder: DebruijnIndex,
222222
) -> ControlFlow<B> {
223223
let interner = visitor.interner();
@@ -229,7 +229,7 @@ impl<I: Interner> TypeVisitable<I> for ProgramClauses<I> {
229229
impl<I: Interner> TypeVisitable<I> for Constraints<I> {
230230
fn visit_with<B>(
231231
&self,
232-
visitor: &mut dyn Visitor<I, BreakTy = B>,
232+
visitor: &mut dyn TypeVisitor<I, BreakTy = B>,
233233
outer_binder: DebruijnIndex,
234234
) -> ControlFlow<B> {
235235
let interner = visitor.interner();
@@ -241,7 +241,7 @@ impl<I: Interner> TypeVisitable<I> for Constraints<I> {
241241
impl<I: Interner> TypeVisitable<I> for QuantifiedWhereClauses<I> {
242242
fn visit_with<B>(
243243
&self,
244-
visitor: &mut dyn Visitor<I, BreakTy = B>,
244+
visitor: &mut dyn TypeVisitor<I, BreakTy = B>,
245245
outer_binder: DebruijnIndex,
246246
) -> ControlFlow<B> {
247247
let interner = visitor.interner();
@@ -253,7 +253,7 @@ impl<I: Interner> TypeVisitable<I> for QuantifiedWhereClauses<I> {
253253
impl<I: Interner> TypeVisitable<I> for PhantomData<I> {
254254
fn visit_with<B>(
255255
&self,
256-
_visitor: &mut dyn Visitor<I, BreakTy = B>,
256+
_visitor: &mut dyn TypeVisitor<I, BreakTy = B>,
257257
_outer_binder: DebruijnIndex,
258258
) -> ControlFlow<B> {
259259
ControlFlow::Continue(())

‎chalk-ir/src/visit/visitors.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
//! Visitor helpers
1+
//! TypeVisitor helpers
22
3-
use crate::{BoundVar, ControlFlow, DebruijnIndex, Interner, TypeVisitable, Visitor};
3+
use crate::{BoundVar, ControlFlow, DebruijnIndex, Interner, TypeVisitable, TypeVisitor};
44

5-
/// Visitor extensions.
5+
/// TypeVisitor extensions.
66
pub trait VisitExt<I: Interner>: TypeVisitable<I> {
77
/// Check whether there are free (non-bound) variables.
88
fn has_free_vars(&self, interner: I) -> bool {
@@ -20,10 +20,10 @@ struct FindFreeVarsVisitor<I: Interner> {
2020
interner: I,
2121
}
2222

23-
impl<I: Interner> Visitor<I> for FindFreeVarsVisitor<I> {
23+
impl<I: Interner> TypeVisitor<I> for FindFreeVarsVisitor<I> {
2424
type BreakTy = ();
2525

26-
fn as_dyn(&mut self) -> &mut dyn Visitor<I, BreakTy = Self::BreakTy> {
26+
fn as_dyn(&mut self) -> &mut dyn TypeVisitor<I, BreakTy = Self::BreakTy> {
2727
self
2828
}
2929

0 commit comments

Comments
 (0)