---

yaml
---
r: 149927
b: refs/heads/try2
c: 01a15d5
h: refs/heads/master
i:
  149925: db699b1
  149923: 82b0878
  149919: aa8ead9
v: v3

Author: nikomatsakis

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: a7db0d5d30adbaec2b4ec6e009a0bf9c7850f9be
+refs/heads/try2: 01a15d5870169636cec50a1f9d98bc967472a680
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

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

@@ -509,8 +509,8 @@ fn visit_expr(rcx: &mut Rcx, expr: &ast::Expr) {
             };
             match ty::get(base_ty).sty {
                 ty::ty_rptr(r_ptr, _) => {
-                    mk_subregion_due_to_derefence(rcx, expr.span,
-                                                  ty::ReScope(expr.id), r_ptr);
+                    mk_subregion_due_to_dereference(rcx, expr.span,
+                                                    ty::ReScope(expr.id), r_ptr);
                 }
                 _ => {}
             }
@@ -843,10 +843,9 @@ fn constrain_autoderefs(rcx: &mut Rcx,
                         derefs: uint,
                         mut derefd_ty: ty::t) {
     /*!
-     * Invoked on any dereference that occurs, whether explicitly
-     * or through an auto-deref.  Checks that if this is a region
-     * pointer being derefenced, the lifetime of the pointer includes
-     * the deref expr.
+     * Invoked on any auto-dereference that occurs.  Checks that if
+     * this is a region pointer being dereferenced, the lifetime of
+     * the pointer includes the deref expr.
      */
     let r_deref_expr = ty::ReScope(deref_expr.id);
     for i in range(0u, derefs) {
@@ -887,8 +886,8 @@ fn constrain_autoderefs(rcx: &mut Rcx,
 
         match ty::get(derefd_ty).sty {
             ty::ty_rptr(r_ptr, _) => {
-                mk_subregion_due_to_derefence(rcx, deref_expr.span,
-                                              r_deref_expr, r_ptr);
+                mk_subregion_due_to_dereference(rcx, deref_expr.span,
+                                                r_deref_expr, r_ptr);
             }
             _ => {}
         }
@@ -902,10 +901,10 @@ fn constrain_autoderefs(rcx: &mut Rcx,
     }
 }
 
-pub fn mk_subregion_due_to_derefence(rcx: &mut Rcx,
-                                     deref_span: Span,
-                                     minimum_lifetime: ty::Region,
-                                     maximum_lifetime: ty::Region) {
+pub fn mk_subregion_due_to_dereference(rcx: &mut Rcx,
+                                       deref_span: Span,
+                                       minimum_lifetime: ty::Region,
+                                       maximum_lifetime: ty::Region) {
     rcx.fcx.mk_subr(true, infer::DerefPointer(deref_span),
                     minimum_lifetime, maximum_lifetime)
 }