---

yaml
---
r: 233591
b: refs/heads/beta
c: 1630c79
h: refs/heads/master
i:
  233589: 9f24f6d
  233587: 0313798
  233583: 0399532
v: v3

Author: nikomatsakis

[refs]

@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
 refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
 refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
 refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
-refs/heads/beta: a54b91ff5bb1672ba0dc83a5ead0e599723714f6
+refs/heads/beta: 1630c7912f986f788b808160a004baea4180b64f
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: 370fe2786109360f7c35b8ba552b83b773dd71d6
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/src/librustc/middle/free_region.rs

@@ -104,7 +104,7 @@ impl FreeRegionMap {
         let r_a = ty::ReFree(fr_a);
         let r_b = ty::ReFree(fr_b);
         let result = if fr_a == fr_b { r_a } else {
-            match self.relation.best_upper_bound(&r_a, &r_b) {
+            match self.relation.postdom_upper_bound(&r_a, &r_b) {
                 None => ty::ReStatic,
                 Some(r) => *r,
             }

branches/beta/src/librustc_data_structures/transitive_relation.rs

@@ -107,7 +107,7 @@ impl<T:Debug+PartialEq> TransitiveRelation<T> {
     ///
     /// Examples are probably clearer than any prose I could write
     /// (there are corresponding tests below, btw). In each case,
-    /// the query is `best_upper_bound(a, b)`:
+    /// the query is `postdom_upper_bound(a, b)`:
     ///
     /// ```
     /// // returns Some(x), which is also LUB
@@ -127,7 +127,7 @@ impl<T:Debug+PartialEq> TransitiveRelation<T> {
     /// a -> a1
     /// b -> b1
     /// ```
-    pub fn best_upper_bound(&self, a: &T, b: &T) -> Option<&T> {
+    pub fn postdom_upper_bound(&self, a: &T, b: &T) -> Option<&T> {
         let mut mubs = self.minimal_upper_bounds(a, b);
         loop {
             match mubs.len() {
@@ -422,7 +422,7 @@ fn mubs_best_choice_scc() {
 }
 
 #[test]
-fn bub_crisscross() {
+fn pdub_crisscross() {
     // diagonal edges run left-to-right
     // a -> a1 -> x
     //   \/       ^
@@ -438,11 +438,11 @@ fn bub_crisscross() {
     relation.add("b1", "x");
 
     assert_eq!(relation.minimal_upper_bounds(&"a", &"b"), vec![&"a1", &"b1"]);
-    assert_eq!(relation.best_upper_bound(&"a", &"b"), Some(&"x"));
+    assert_eq!(relation.postdom_upper_bound(&"a", &"b"), Some(&"x"));
 }
 
 #[test]
-fn bub_crisscross_more() {
+fn pdub_crisscross_more() {
     // diagonal edges run left-to-right
     // a -> a1 -> a2 -> a3 -> x
     //   \/    \/             ^
@@ -467,11 +467,11 @@ fn bub_crisscross_more() {
 
     assert_eq!(relation.minimal_upper_bounds(&"a", &"b"), vec![&"a1", &"b1"]);
     assert_eq!(relation.minimal_upper_bounds(&"a1", &"b1"), vec![&"a2", &"b2"]);
-    assert_eq!(relation.best_upper_bound(&"a", &"b"), Some(&"x"));
+    assert_eq!(relation.postdom_upper_bound(&"a", &"b"), Some(&"x"));
 }
 
 #[test]
-fn bub_lub() {
+fn pdub_lub() {
     // a -> a1 -> x
     //            ^
     //            |
@@ -484,7 +484,7 @@ fn bub_lub() {
     relation.add("b1", "x");
 
     assert_eq!(relation.minimal_upper_bounds(&"a", &"b"), vec![&"x"]);
-    assert_eq!(relation.best_upper_bound(&"a", &"b"), Some(&"x"));
+    assert_eq!(relation.postdom_upper_bound(&"a", &"b"), Some(&"x"));
 }
 
 #[test]