From 0e774de7661df81cf0e5537ef581823fc148fc2a Mon Sep 17 00:00:00 2001 From: Tim Chevalier Date: Mon, 7 Jan 2013 18:15:44 -0800 Subject: [PATCH] Revert "Improve a typeck ICE message (slightly)" This reverts commit c662a9aad7a158c797faa4bd805808f867a3e22e. --- src/librustc/middle/typeck/check/method.rs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/librustc/middle/typeck/check/method.rs b/src/librustc/middle/typeck/check/method.rs index f903270e15c..1a788fd9574 100644 --- a/src/librustc/middle/typeck/check/method.rs +++ b/src/librustc/middle/typeck/check/method.rs @@ -282,9 +282,8 @@ fn push_inherent_candidates(&self, self_ty: ty::t) { ty_self => { // Call is of the form "self.foo()" and appears in one // of a trait's default method implementations. - let self_did = self.fcx.self_info.expect( - ~"self_impl_def_id is undefined (`self` may not \ - be in scope here").def_id; + let self_did = self.fcx.self_impl_def_id.expect( + ~"unexpected `none` for self_impl_def_id"); let substs = {self_r: None, self_ty: None, tps: ~[]}; self.push_inherent_candidates_from_self( self_ty, self_did, &substs);