---

emberian · emberian · commit 4730cfcb49c4 · 2014-04-02T11:17:23.000-04:00
yaml --- r: 109873 b: refs/heads/master c: ce47c91 h: refs/heads/master i: 109871: 3758a39 v: v3
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 1a98ec83c1a470ef18ee6fa9b2eedc237032d64c
+refs/heads/master: ce47c91bfc27d41d8e674c4aed0e431c1eab75f6
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: c7fac4471201977fdb1c0c0a26c87287e12dc644
 refs/heads/try: f64fdf524a434f0e5cd0bc91d09c144723f3c90d
diff --git a/trunk/src/librustc/middle/typeck/infer/lub.rs b/trunk/src/librustc/middle/typeck/infer/lub.rs
@@ -31,10 +31,6 @@ pub struct Lub<'f>(CombineFields<'f>);  // least-upper-bound: common supertype
 
 impl<'f> Lub<'f> {
     pub fn get_ref<'a>(&'a self) -> &'a CombineFields<'f> { let Lub(ref v) = *self; v }
-    pub fn bot_ty(&self, b: ty::t) -> cres<ty::t> { Ok(b) }
-    pub fn ty_bot(&self, b: ty::t) -> cres<ty::t> {
-        self.bot_ty(b) // commutative
-    }
 }
 
 impl<'f> Combine for Lub<'f> {

Original file line number	Diff line number	Diff line change
`@@ -31,10 +31,6 @@ pub struct Lub<'f>(CombineFields<'f>); // least-upper-bound: common supertype`
`31`	`31`
`32`	`32`	`impl<'f> Lub<'f> {`
`33`	`33`	`pub fn get_ref<'a>(&'a self) -> &'a CombineFields<'f> { let Lub(ref v) = *self; v }`
`34`		`- pub fn bot_ty(&self, b: ty::t) -> cres<ty::t> { Ok(b) }`
`35`		`- pub fn ty_bot(&self, b: ty::t) -> cres<ty::t> {`
`36`		`- self.bot_ty(b) // commutative`
`37`		`- }`
`38`	`34`	`}`
`39`	`35`
`40`	`36`	`impl<'f> Combine for Lub<'f> {`