Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rustc: Remove some dead code from method resolution #7985

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 3 additions & 17 deletions src/librustc/middle/typeck/check/method.rs
Original file line number Diff line number Diff line change
@@ -194,7 +194,6 @@ impl<'self> LookupContext<'self> {
self.push_inherent_candidates(self_ty);
self.push_extension_candidates();

let mut enum_dids = ~[];
let mut self_ty = self_ty;
let mut autoderefs = 0;
loop {
@@ -236,7 +235,7 @@ impl<'self> LookupContext<'self> {
}

// Otherwise, perform autoderef.
match self.deref(self_ty, &mut enum_dids) {
match self.deref(self_ty) {
None => { break; }
Some(ty) => {
self_ty = ty;
@@ -248,20 +247,8 @@ impl<'self> LookupContext<'self> {
self.search_for_autosliced_method(self_ty, autoderefs)
}

pub fn deref(&self, ty: ty::t, enum_dids: &mut ~[ast::def_id])
pub fn deref(&self, ty: ty::t)
-> Option<ty::t> {
match ty::get(ty).sty {
ty_enum(did, _) => {
// Watch out for newtype'd enums like "enum t = @T".
// See discussion in typeck::check::do_autoderef().
if enum_dids.iter().any(|x| x == &did) {
return None;
}
enum_dids.push(did);
}
_ => {}
}

match ty::deref(self.tcx(), ty, false) {
None => None,
Some(t) => {
@@ -285,7 +272,6 @@ impl<'self> LookupContext<'self> {
* we'll want to find the inherent impls for `C`.
*/

let mut enum_dids = ~[];
let mut self_ty = self_ty;
loop {
match get(self_ty).sty {
@@ -314,7 +300,7 @@ impl<'self> LookupContext<'self> {
// n.b.: Generally speaking, we only loop if we hit the
// fallthrough case in the match above. The exception
// would be newtype enums.
self_ty = match self.deref(self_ty, &mut enum_dids) {
self_ty = match self.deref(self_ty) {
None => { return; }
Some(ty) => { ty }
}