@@ -62,7 +62,7 @@ to pump constraints along and reach a fixed point, but it does impose
62
62
some heuristics in the case where the user is relating two type
63
63
variables A <: B.
64
64
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
66
66
type the variable represents, but we must make some change that will
67
67
ensure that, whatever types A and B are resolved to, they are resolved
68
68
to types which have a subtype relation.
@@ -989,34 +989,34 @@ impl assignment for infer_ctxt {
989
989
alt ( ty:: get( a_bnd) . struct , ty:: get( b_bnd) . struct ) {
990
990
( ty:: ty_box( mt_a) , ty:: ty_rptr( r_b, mt_b) ) {
991
991
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)
993
993
}
994
994
( ty:: ty_uniq( mt_a) , ty:: ty_rptr( r_b, mt_b) ) {
995
995
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)
997
997
}
998
998
( ty:: ty_estr( vs_a) ,
999
999
ty:: ty_estr( ty:: vstore_slice( r_b) ) )
1000
1000
if is_borrowable( vs_a) {
1001
1001
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)
1003
1003
}
1004
1004
( ty:: ty_str,
1005
1005
ty:: ty_estr( ty:: vstore_slice( r_b) ) ) {
1006
1006
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)
1008
1008
}
1009
1009
1010
1010
( ty:: ty_evec( mt_a, vs_a) ,
1011
1011
ty:: ty_evec( mt_b, ty:: vstore_slice( r_b) ) )
1012
1012
if is_borrowable( vs_a) {
1013
1013
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)
1015
1015
}
1016
1016
( ty:: ty_vec( mt_a) ,
1017
1017
ty:: ty_evec( mt_b, ty:: vstore_slice( r_b) ) ) {
1018
1018
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)
1020
1020
}
1021
1021
_ {
1022
1022
self . sub_tys( a, b)
@@ -1029,12 +1029,12 @@ impl assignment for infer_ctxt {
1029
1029
}
1030
1030
}
1031
1031
1032
- fn crosspolinate ( anmnt: assignment,
1032
+ fn crosspollinate ( anmnt: assignment,
1033
1033
a: ty:: t,
1034
1034
nr_b: ty:: t,
1035
1035
r_b: ty:: region) -> ures {
1036
1036
1037
- #debug[ "crosspolinate (anmnt=%?, a=%s, nr_b=%s, r_b=%s)" ,
1037
+ #debug[ "crosspollinate (anmnt=%?, a=%s, nr_b=%s, r_b=%s)" ,
1038
1038
anmnt, a. to_str( self ) , nr_b. to_str( self ) ,
1039
1039
r_b. to_str( self ) ] ;
1040
1040
0 commit comments