Skip to content

Commit

Permalink
reflect: rm unused visit_{var,var_integral,constr}
Browse files Browse the repository at this point in the history
  • Loading branch information
thestinger committed Aug 27, 2013
1 parent ac4f0df commit 803f941
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 44 deletions.
15 changes: 0 additions & 15 deletions src/libstd/reflect.rs
Original file line number Diff line number Diff line change
Expand Up @@ -460,16 +460,6 @@ impl<V:TyVisitor + MovePtr> TyVisitor for MovePtrAdaptor<V> {
true
}

fn visit_var(&self) -> bool {
if ! self.inner.visit_var() { return false; }
true
}

fn visit_var_integral(&self) -> bool {
if ! self.inner.visit_var_integral() { return false; }
true
}

fn visit_param(&self, i: uint) -> bool {
if ! self.inner.visit_param(i) { return false; }
true
Expand All @@ -494,11 +484,6 @@ impl<V:TyVisitor + MovePtr> TyVisitor for MovePtrAdaptor<V> {
true
}

fn visit_constr(&self, inner: *TyDesc) -> bool {
if ! self.inner.visit_constr(inner) { return false; }
true
}

fn visit_closure_ptr(&self, ck: uint) -> bool {
self.align_to::<@fn()>();
if ! self.inner.visit_closure_ptr(ck) { return false; }
Expand Down
5 changes: 0 additions & 5 deletions src/libstd/repr.rs
Original file line number Diff line number Diff line change
Expand Up @@ -563,8 +563,6 @@ impl TyVisitor for ReprVisitor {


fn visit_trait(&self) -> bool { true }
fn visit_var(&self) -> bool { true }
fn visit_var_integral(&self) -> bool { true }
fn visit_param(&self, _i: uint) -> bool { true }
fn visit_self(&self) -> bool { true }
fn visit_type(&self) -> bool { true }
Expand All @@ -577,9 +575,6 @@ impl TyVisitor for ReprVisitor {
}
}

// Type no longer exists, vestigial function.
fn visit_constr(&self, _inner: *TyDesc) -> bool { fail!(); }

fn visit_closure_ptr(&self, _ck: uint) -> bool { true }
}

Expand Down
3 changes: 0 additions & 3 deletions src/libstd/unstable/intrinsics.rs
Original file line number Diff line number Diff line change
Expand Up @@ -161,13 +161,10 @@ pub trait TyVisitor {
n_inputs: uint, retstyle: uint) -> bool;

fn visit_trait(&self) -> bool;
fn visit_var(&self) -> bool;
fn visit_var_integral(&self) -> bool;
fn visit_param(&self, i: uint) -> bool;
fn visit_self(&self) -> bool;
fn visit_type(&self) -> bool;
fn visit_opaque_box(&self) -> bool;
fn visit_constr(&self, inner: *TyDesc) -> bool;
fn visit_closure_ptr(&self, ck: uint) -> bool;
}

Expand Down
18 changes: 0 additions & 18 deletions src/test/run-pass/reflect-visit-data.rs
Original file line number Diff line number Diff line change
Expand Up @@ -436,16 +436,6 @@ impl<V:TyVisitor + movable_ptr> TyVisitor for ptr_visit_adaptor<V> {
true
}

fn visit_var(&self) -> bool {
if ! self.inner.visit_var() { return false; }
true
}

fn visit_var_integral(&self) -> bool {
if ! self.inner.visit_var_integral() { return false; }
true
}

fn visit_param(&self, i: uint) -> bool {
if ! self.inner.visit_param(i) { return false; }
true
Expand All @@ -470,11 +460,6 @@ impl<V:TyVisitor + movable_ptr> TyVisitor for ptr_visit_adaptor<V> {
true
}

fn visit_constr(&self, inner: *TyDesc) -> bool {
if ! self.inner.visit_constr(inner) { return false; }
true
}

fn visit_closure_ptr(&self, ck: uint) -> bool {
self.align_to::<@fn()>();
if ! self.inner.visit_closure_ptr(ck) { return false; }
Expand Down Expand Up @@ -633,13 +618,10 @@ impl TyVisitor for my_visitor {


fn visit_trait(&self) -> bool { true }
fn visit_var(&self) -> bool { true }
fn visit_var_integral(&self) -> bool { true }
fn visit_param(&self, _i: uint) -> bool { true }
fn visit_self(&self) -> bool { true }
fn visit_type(&self) -> bool { true }
fn visit_opaque_box(&self) -> bool { true }
fn visit_constr(&self, _inner: *TyDesc) -> bool { true }
fn visit_closure_ptr(&self, _ck: uint) -> bool { true }
}

Expand Down
3 changes: 0 additions & 3 deletions src/test/run-pass/reflect-visit-type.rs
Original file line number Diff line number Diff line change
Expand Up @@ -144,13 +144,10 @@ impl TyVisitor for MyVisitor {


fn visit_trait(&self) -> bool { true }
fn visit_var(&self) -> bool { true }
fn visit_var_integral(&self) -> bool { true }
fn visit_param(&self, _i: uint) -> bool { true }
fn visit_self(&self) -> bool { true }
fn visit_type(&self) -> bool { true }
fn visit_opaque_box(&self) -> bool { true }
fn visit_constr(&self, _inner: *TyDesc) -> bool { true }
fn visit_closure_ptr(&self, _ck: uint) -> bool { true }
}

Expand Down

5 comments on commit 803f941

@bors
Copy link
Contributor

@bors bors commented on 803f941 Aug 27, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors
Copy link
Contributor

@bors bors commented on 803f941 Aug 27, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging thestinger/rust/repr = 803f941 into auto

@bors
Copy link
Contributor

@bors bors commented on 803f941 Aug 27, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thestinger/rust/repr = 803f941 merged ok, testing candidate = 7f32ea8

@bors
Copy link
Contributor

@bors bors commented on 803f941 Aug 27, 2013

@bors
Copy link
Contributor

@bors bors commented on 803f941 Aug 27, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = 7f32ea8

Please sign in to comment.