---

yaml
---
r: 15835
b: refs/heads/try
c: 76f49e4
h: refs/heads/master
i:
  15833: 0f68534
  15831: 617e914
v: v3

Author: lkuper

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: fa2ac6646233384deb6ff694da4e3b674a187cd0
+refs/heads/try: 76f49e497ec43d5ee3d577727a0f9702c4e16b4b
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/rustc/middle/typeck/infer.rs

@@ -62,7 +62,7 @@ to pump constraints along and reach a fixed point, but it does impose
 some heuristics in the case where the user is relating two type
 variables A <: B.
 
-The key point when relating type variables is that we do not know whta
+The key point when relating type variables is that we do not know what
 type the variable represents, but we must make some change that will
 ensure that, whatever types A and B are resolved to, they are resolved
 to types which have a subtype relation.
@@ -989,34 +989,34 @@ impl assignment for infer_ctxt {
             alt (ty::get(a_bnd).struct, ty::get(b_bnd).struct) {
               (ty::ty_box(mt_a), ty::ty_rptr(r_b, mt_b)) {
                 let nr_b = ty::mk_box(self.tcx, mt_b);
-                self.crosspolinate(anmnt, a, nr_b, r_b)
+                self.crosspollinate(anmnt, a, nr_b, r_b)
               }
               (ty::ty_uniq(mt_a), ty::ty_rptr(r_b, mt_b)) {
                 let nr_b = ty::mk_uniq(self.tcx, mt_b);
-                self.crosspolinate(anmnt, a, nr_b, r_b)
+                self.crosspollinate(anmnt, a, nr_b, r_b)
               }
               (ty::ty_estr(vs_a),
                ty::ty_estr(ty::vstore_slice(r_b)))
               if is_borrowable(vs_a) {
                 let nr_b = ty::mk_estr(self.tcx, vs_a);
-                self.crosspolinate(anmnt, a, nr_b, r_b)
+                self.crosspollinate(anmnt, a, nr_b, r_b)
               }
               (ty::ty_str,
                ty::ty_estr(ty::vstore_slice(r_b))) {
                 let nr_b = ty::mk_str(self.tcx);
-                self.crosspolinate(anmnt, a, nr_b, r_b)
+                self.crosspollinate(anmnt, a, nr_b, r_b)
               }
 
               (ty::ty_evec(mt_a, vs_a),
                ty::ty_evec(mt_b, ty::vstore_slice(r_b)))
               if is_borrowable(vs_a) {
                 let nr_b = ty::mk_evec(self.tcx, mt_b, vs_a);
-                self.crosspolinate(anmnt, a, nr_b, r_b)
+                self.crosspollinate(anmnt, a, nr_b, r_b)
               }
               (ty::ty_vec(mt_a),
                ty::ty_evec(mt_b, ty::vstore_slice(r_b))) {
                 let nr_b = ty::mk_vec(self.tcx, mt_b);
-                self.crosspolinate(anmnt, a, nr_b, r_b)
+                self.crosspollinate(anmnt, a, nr_b, r_b)
               }
               _ {
                 self.sub_tys(a, b)
@@ -1029,12 +1029,12 @@ impl assignment for infer_ctxt {
         }
     }
 
-    fn crosspolinate(anmnt: assignment,
+    fn crosspollinate(anmnt: assignment,
                      a: ty::t,
                      nr_b: ty::t,
                      r_b: ty::region) -> ures {
 
-        #debug["crosspolinate(anmnt=%?, a=%s, nr_b=%s, r_b=%s)",
+        #debug["crosspollinate(anmnt=%?, a=%s, nr_b=%s, r_b=%s)",
                anmnt, a.to_str(self), nr_b.to_str(self),
                r_b.to_str(self)];