@@ -509,8 +509,8 @@ fn visit_expr(rcx: &mut Rcx, expr: &ast::Expr) {
509
509
} ;
510
510
match ty:: get ( base_ty) . sty {
511
511
ty:: ty_rptr( r_ptr, _) => {
512
- mk_subregion_due_to_derefence ( rcx, expr. span ,
513
- ty:: ReScope ( expr. id ) , r_ptr) ;
512
+ mk_subregion_due_to_dereference ( rcx, expr. span ,
513
+ ty:: ReScope ( expr. id ) , r_ptr) ;
514
514
}
515
515
_ => { }
516
516
}
@@ -843,10 +843,9 @@ fn constrain_autoderefs(rcx: &mut Rcx,
843
843
derefs : uint ,
844
844
mut derefd_ty : ty:: t ) {
845
845
/*!
846
- * Invoked on any dereference that occurs, whether explicitly
847
- * or through an auto-deref. Checks that if this is a region
848
- * pointer being derefenced, the lifetime of the pointer includes
849
- * the deref expr.
846
+ * Invoked on any auto-dereference that occurs. Checks that if
847
+ * this is a region pointer being dereferenced, the lifetime of
848
+ * the pointer includes the deref expr.
850
849
*/
851
850
let r_deref_expr = ty:: ReScope ( deref_expr. id ) ;
852
851
for i in range ( 0 u, derefs) {
@@ -887,8 +886,8 @@ fn constrain_autoderefs(rcx: &mut Rcx,
887
886
888
887
match ty:: get ( derefd_ty) . sty {
889
888
ty:: ty_rptr( r_ptr, _) => {
890
- mk_subregion_due_to_derefence ( rcx, deref_expr. span ,
891
- r_deref_expr, r_ptr) ;
889
+ mk_subregion_due_to_dereference ( rcx, deref_expr. span ,
890
+ r_deref_expr, r_ptr) ;
892
891
}
893
892
_ => { }
894
893
}
@@ -902,10 +901,10 @@ fn constrain_autoderefs(rcx: &mut Rcx,
902
901
}
903
902
}
904
903
905
- pub fn mk_subregion_due_to_derefence ( rcx : & mut Rcx ,
906
- deref_span : Span ,
907
- minimum_lifetime : ty:: Region ,
908
- maximum_lifetime : ty:: Region ) {
904
+ pub fn mk_subregion_due_to_dereference ( rcx : & mut Rcx ,
905
+ deref_span : Span ,
906
+ minimum_lifetime : ty:: Region ,
907
+ maximum_lifetime : ty:: Region ) {
909
908
rcx. fcx . mk_subr ( true , infer:: DerefPointer ( deref_span) ,
910
909
minimum_lifetime, maximum_lifetime)
911
910
}
0 commit comments