remove hacks now that #3148 is fixed

r=brson

Author: nikomatsakis

Diff for: src/librustc/middle/typeck/check/method.rs

@@ -739,18 +739,20 @@ impl LookupContext {
 
         let tcx = self.tcx();
         return match ty::get(self_ty).sty {
-            ty::ty_rptr(self_r, self_mt) if self_mt.mutbl == m_mutbl => {
-                let region = fresh_region(self, self_r);
+            ty::ty_rptr(_, self_mt) if self_mt.mutbl == m_mutbl => {
+                let region = self.infcx().next_region_var(self.expr.span,
+                                                          self.expr.id);
                 (ty::mk_rptr(tcx, region, self_mt),
                  ty::AutoAdjustment {
                      autoderefs: autoderefs+1,
                      autoref: Some(ty::AutoRef {kind: AutoPtr,
                                                 region: region,
                                                 mutbl: self_mt.mutbl})})
             }
-            ty::ty_evec(self_mt, vstore_slice(self_r))
+            ty::ty_evec(self_mt, vstore_slice(_))
             if self_mt.mutbl == m_mutbl => {
-                let region = fresh_region(self, self_r);
+                let region = self.infcx().next_region_var(self.expr.span,
+                                                          self.expr.id);
                 (ty::mk_evec(tcx, self_mt, vstore_slice(region)),
                  ty::AutoAdjustment {
                     autoderefs: autoderefs,
@@ -763,26 +765,6 @@ impl LookupContext {
                                               autoref: None})
             }
         };
-
-        fn fresh_region(self: &LookupContext,
-                        self_r: ty::Region) -> ty::Region {
-            let region = self.infcx().next_region_var(self.expr.span,
-                                                      self.expr.id);
-
-            // FIXME(#3148)---in principle this dependency should
-            // be done more generally as part of regionck
-            match infer::mk_subr(self.infcx(), true, self.expr.span,
-                                 region, self_r) {
-                Ok(_) => {}
-                Err(e) => {
-                    self.tcx().sess.span_bug(
-                        self.expr.span,
-                        fmt!("Failed with error: %?", e));
-                }
-            }
-
-            return region;
-        }
     }
 
     fn search_for_autosliced_method(

Diff for: src/librustc/middle/typeck/infer/coercion.rs

@@ -196,15 +196,7 @@ impl Coerce {
         let inner_ty = match *sty_a {
             ty::ty_box(mt_a) => mt_a.ty,
             ty::ty_uniq(mt_a) => mt_a.ty,
-            ty::ty_rptr(r_a, mt_a) => {
-                // Ensure that the pointer we are borrowing from lives
-                // at least as long as the borrowed result.
-                //
-                // FIXME(#3148)---in principle this dependency should
-                // be done more generally
-                if_ok!(sub.contraregions(r_a, r_borrow));
-                mt_a.ty
-            }
+            ty::ty_rptr(r_a, mt_a) => mt_a.ty,
             _ => {
                 return self.subtype(a, b);
             }
@@ -267,18 +259,7 @@ impl Coerce {
         let sub = Sub(**self);
         let r_borrow = self.infcx.next_region_var_nb(self.span);
         let ty_inner = match *sty_a {
-            ty::ty_evec(mt, vstore_box) => mt.ty,
-            ty::ty_evec(mt, vstore_uniq) => mt.ty,
-            ty::ty_evec(mt, vstore_fixed(_)) => mt.ty,
-            ty::ty_evec(mt, vstore_slice(r_a)) => {
-                // Ensure that the pointer we are borrowing from lives
-                // at least as long as the borrowed result.
-                //
-                // FIXME(#3148)---in principle this dependency should
-                // be done more generally
-                if_ok!(sub.contraregions(r_a, r_borrow));
-                mt.ty
-            }
+            ty::ty_evec(mt, _) => mt.ty,
             _ => {
                 return self.subtype(a, b);
             }