---

emberian · emberian · commit e2b78e4eb879 · 2014-04-02T11:17:23.000-04:00
yaml --- r: 119174 b: refs/heads/dist-snap c: ce47c91 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -6,7 +6,7 @@ refs/heads/try: 1813e5aa1a03b0596b8de7abd1af31edf5d6098f
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/dist-snap: 1a98ec83c1a470ef18ee6fa9b2eedc237032d64c
+refs/heads/dist-snap: ce47c91bfc27d41d8e674c4aed0e431c1eab75f6
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
diff --git a/branches/dist-snap/src/librustc/middle/typeck/infer/lub.rs b/branches/dist-snap/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> {`