Skip to content

Commit 01a15d5

Browse files
nikomatsakiseddyb
authored andcommitted
Tweak comments
1 parent a7db0d5 commit 01a15d5

File tree

1 file changed

+11
-12
lines changed

1 file changed

+11
-12
lines changed

src/librustc/middle/typeck/check/regionck.rs

+11-12
Original file line numberDiff line numberDiff line change
@@ -509,8 +509,8 @@ fn visit_expr(rcx: &mut Rcx, expr: &ast::Expr) {
509509
};
510510
match ty::get(base_ty).sty {
511511
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);
514514
}
515515
_ => {}
516516
}
@@ -843,10 +843,9 @@ fn constrain_autoderefs(rcx: &mut Rcx,
843843
derefs: uint,
844844
mut derefd_ty: ty::t) {
845845
/*!
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.
850849
*/
851850
let r_deref_expr = ty::ReScope(deref_expr.id);
852851
for i in range(0u, derefs) {
@@ -887,8 +886,8 @@ fn constrain_autoderefs(rcx: &mut Rcx,
887886

888887
match ty::get(derefd_ty).sty {
889888
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);
892891
}
893892
_ => {}
894893
}
@@ -902,10 +901,10 @@ fn constrain_autoderefs(rcx: &mut Rcx,
902901
}
903902
}
904903

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) {
909908
rcx.fcx.mk_subr(true, infer::DerefPointer(deref_span),
910909
minimum_lifetime, maximum_lifetime)
911910
}

0 commit comments

Comments
 (0)