Skip to content

Commit 803f941

Browse files
committed
reflect: rm unused visit_{var,var_integral,constr}
1 parent ac4f0df commit 803f941

File tree

5 files changed

+0
-44
lines changed

5 files changed

+0
-44
lines changed

src/libstd/reflect.rs

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -460,16 +460,6 @@ impl<V:TyVisitor + MovePtr> TyVisitor for MovePtrAdaptor<V> {
460460
true
461461
}
462462

463-
fn visit_var(&self) -> bool {
464-
if ! self.inner.visit_var() { return false; }
465-
true
466-
}
467-
468-
fn visit_var_integral(&self) -> bool {
469-
if ! self.inner.visit_var_integral() { return false; }
470-
true
471-
}
472-
473463
fn visit_param(&self, i: uint) -> bool {
474464
if ! self.inner.visit_param(i) { return false; }
475465
true
@@ -494,11 +484,6 @@ impl<V:TyVisitor + MovePtr> TyVisitor for MovePtrAdaptor<V> {
494484
true
495485
}
496486

497-
fn visit_constr(&self, inner: *TyDesc) -> bool {
498-
if ! self.inner.visit_constr(inner) { return false; }
499-
true
500-
}
501-
502487
fn visit_closure_ptr(&self, ck: uint) -> bool {
503488
self.align_to::<@fn()>();
504489
if ! self.inner.visit_closure_ptr(ck) { return false; }

src/libstd/repr.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -563,8 +563,6 @@ impl TyVisitor for ReprVisitor {
563563

564564

565565
fn visit_trait(&self) -> bool { true }
566-
fn visit_var(&self) -> bool { true }
567-
fn visit_var_integral(&self) -> bool { true }
568566
fn visit_param(&self, _i: uint) -> bool { true }
569567
fn visit_self(&self) -> bool { true }
570568
fn visit_type(&self) -> bool { true }
@@ -577,9 +575,6 @@ impl TyVisitor for ReprVisitor {
577575
}
578576
}
579577

580-
// Type no longer exists, vestigial function.
581-
fn visit_constr(&self, _inner: *TyDesc) -> bool { fail!(); }
582-
583578
fn visit_closure_ptr(&self, _ck: uint) -> bool { true }
584579
}
585580

src/libstd/unstable/intrinsics.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,13 +161,10 @@ pub trait TyVisitor {
161161
n_inputs: uint, retstyle: uint) -> bool;
162162

163163
fn visit_trait(&self) -> bool;
164-
fn visit_var(&self) -> bool;
165-
fn visit_var_integral(&self) -> bool;
166164
fn visit_param(&self, i: uint) -> bool;
167165
fn visit_self(&self) -> bool;
168166
fn visit_type(&self) -> bool;
169167
fn visit_opaque_box(&self) -> bool;
170-
fn visit_constr(&self, inner: *TyDesc) -> bool;
171168
fn visit_closure_ptr(&self, ck: uint) -> bool;
172169
}
173170

src/test/run-pass/reflect-visit-data.rs

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -436,16 +436,6 @@ impl<V:TyVisitor + movable_ptr> TyVisitor for ptr_visit_adaptor<V> {
436436
true
437437
}
438438

439-
fn visit_var(&self) -> bool {
440-
if ! self.inner.visit_var() { return false; }
441-
true
442-
}
443-
444-
fn visit_var_integral(&self) -> bool {
445-
if ! self.inner.visit_var_integral() { return false; }
446-
true
447-
}
448-
449439
fn visit_param(&self, i: uint) -> bool {
450440
if ! self.inner.visit_param(i) { return false; }
451441
true
@@ -470,11 +460,6 @@ impl<V:TyVisitor + movable_ptr> TyVisitor for ptr_visit_adaptor<V> {
470460
true
471461
}
472462

473-
fn visit_constr(&self, inner: *TyDesc) -> bool {
474-
if ! self.inner.visit_constr(inner) { return false; }
475-
true
476-
}
477-
478463
fn visit_closure_ptr(&self, ck: uint) -> bool {
479464
self.align_to::<@fn()>();
480465
if ! self.inner.visit_closure_ptr(ck) { return false; }
@@ -633,13 +618,10 @@ impl TyVisitor for my_visitor {
633618

634619

635620
fn visit_trait(&self) -> bool { true }
636-
fn visit_var(&self) -> bool { true }
637-
fn visit_var_integral(&self) -> bool { true }
638621
fn visit_param(&self, _i: uint) -> bool { true }
639622
fn visit_self(&self) -> bool { true }
640623
fn visit_type(&self) -> bool { true }
641624
fn visit_opaque_box(&self) -> bool { true }
642-
fn visit_constr(&self, _inner: *TyDesc) -> bool { true }
643625
fn visit_closure_ptr(&self, _ck: uint) -> bool { true }
644626
}
645627

src/test/run-pass/reflect-visit-type.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,13 +144,10 @@ impl TyVisitor for MyVisitor {
144144

145145

146146
fn visit_trait(&self) -> bool { true }
147-
fn visit_var(&self) -> bool { true }
148-
fn visit_var_integral(&self) -> bool { true }
149147
fn visit_param(&self, _i: uint) -> bool { true }
150148
fn visit_self(&self) -> bool { true }
151149
fn visit_type(&self) -> bool { true }
152150
fn visit_opaque_box(&self) -> bool { true }
153-
fn visit_constr(&self, _inner: *TyDesc) -> bool { true }
154151
fn visit_closure_ptr(&self, _ck: uint) -> bool { true }
155152
}
156153

0 commit comments

Comments
 (0)