Skip to content

Commit 76f49e4

Browse files
committed
Typo fixes.
1 parent fa2ac66 commit 76f49e4

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

src/rustc/middle/typeck/infer.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ to pump constraints along and reach a fixed point, but it does impose
6262
some heuristics in the case where the user is relating two type
6363
variables A <: B.
6464
65-
The key point when relating type variables is that we do not know whta
65+
The key point when relating type variables is that we do not know what
6666
type the variable represents, but we must make some change that will
6767
ensure that, whatever types A and B are resolved to, they are resolved
6868
to types which have a subtype relation.
@@ -989,34 +989,34 @@ impl assignment for infer_ctxt {
989989
alt (ty::get(a_bnd).struct, ty::get(b_bnd).struct) {
990990
(ty::ty_box(mt_a), ty::ty_rptr(r_b, mt_b)) {
991991
let nr_b = ty::mk_box(self.tcx, mt_b);
992-
self.crosspolinate(anmnt, a, nr_b, r_b)
992+
self.crosspollinate(anmnt, a, nr_b, r_b)
993993
}
994994
(ty::ty_uniq(mt_a), ty::ty_rptr(r_b, mt_b)) {
995995
let nr_b = ty::mk_uniq(self.tcx, mt_b);
996-
self.crosspolinate(anmnt, a, nr_b, r_b)
996+
self.crosspollinate(anmnt, a, nr_b, r_b)
997997
}
998998
(ty::ty_estr(vs_a),
999999
ty::ty_estr(ty::vstore_slice(r_b)))
10001000
if is_borrowable(vs_a) {
10011001
let nr_b = ty::mk_estr(self.tcx, vs_a);
1002-
self.crosspolinate(anmnt, a, nr_b, r_b)
1002+
self.crosspollinate(anmnt, a, nr_b, r_b)
10031003
}
10041004
(ty::ty_str,
10051005
ty::ty_estr(ty::vstore_slice(r_b))) {
10061006
let nr_b = ty::mk_str(self.tcx);
1007-
self.crosspolinate(anmnt, a, nr_b, r_b)
1007+
self.crosspollinate(anmnt, a, nr_b, r_b)
10081008
}
10091009

10101010
(ty::ty_evec(mt_a, vs_a),
10111011
ty::ty_evec(mt_b, ty::vstore_slice(r_b)))
10121012
if is_borrowable(vs_a) {
10131013
let nr_b = ty::mk_evec(self.tcx, mt_b, vs_a);
1014-
self.crosspolinate(anmnt, a, nr_b, r_b)
1014+
self.crosspollinate(anmnt, a, nr_b, r_b)
10151015
}
10161016
(ty::ty_vec(mt_a),
10171017
ty::ty_evec(mt_b, ty::vstore_slice(r_b))) {
10181018
let nr_b = ty::mk_vec(self.tcx, mt_b);
1019-
self.crosspolinate(anmnt, a, nr_b, r_b)
1019+
self.crosspollinate(anmnt, a, nr_b, r_b)
10201020
}
10211021
_ {
10221022
self.sub_tys(a, b)
@@ -1029,12 +1029,12 @@ impl assignment for infer_ctxt {
10291029
}
10301030
}
10311031

1032-
fn crosspolinate(anmnt: assignment,
1032+
fn crosspollinate(anmnt: assignment,
10331033
a: ty::t,
10341034
nr_b: ty::t,
10351035
r_b: ty::region) -> ures {
10361036

1037-
#debug["crosspolinate(anmnt=%?, a=%s, nr_b=%s, r_b=%s)",
1037+
#debug["crosspollinate(anmnt=%?, a=%s, nr_b=%s, r_b=%s)",
10381038
anmnt, a.to_str(self), nr_b.to_str(self),
10391039
r_b.to_str(self)];
10401040

0 commit comments

Comments
 (0)