---

emberian · emberian · commit 7e04bcc2cb26 · 2014-04-02T11:17:23.000-04:00
yaml --- r: 110083 b: refs/heads/auto c: ce47c91 h: refs/heads/master i: 110081: bc121eb 110079: 71f5569 v: v3
diff --git a/[refs] b/[refs]
@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 1a98ec83c1a470ef18ee6fa9b2eedc237032d64c
+refs/heads/auto: ce47c91bfc27d41d8e674c4aed0e431c1eab75f6
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
diff --git a/branches/auto/src/librustc/middle/typeck/infer/lub.rs b/branches/auto/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> {`