---

yaml
---
r: 49575
b: refs/heads/master
c: 624a685
h: refs/heads/master
i:
  49573: 890ef27
  49571: c6bda98
  49567: 82b04cb
v: v3

Author: Kimundi

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 74fb263f7a8d385635e0861593ce6d72d0e5ec10
+refs/heads/master: 624a685283f66afcb40ee3c235624aedebc2f08f
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: f7a2371c176663d59062ec5158f39faecba45768
 refs/heads/try: 2a8fb58d79e685d5ca07b039badcf2ae3ef077ea

trunk/src/libcore/num/strconv.rs

@@ -130,6 +130,13 @@ impl_NumStrConv_Integer!(u16)
 impl_NumStrConv_Integer!(u32)
 impl_NumStrConv_Integer!(u64)
 
+
+// Special value strings as [u8] consts.
+const inf_buf:          [u8*3] = ['i' as u8, 'n' as u8, 'f' as u8];
+const positive_inf_buf: [u8*4] = ['+' as u8, 'i' as u8, 'n' as u8, 'f' as u8];
+const negative_inf_buf: [u8*4] = ['-' as u8, 'i' as u8, 'n' as u8, 'f' as u8];
+const nan_buf:          [u8*3] = ['N' as u8, 'a' as u8, 'N' as u8];
+
 /**
  * Converts a number to its string representation as a byte vector.
  * This is meant to be a common base implementation for all numeric string
@@ -479,15 +486,15 @@ pub fn from_str_bytes_common<T:NumCast+Zero+One+Ord+Copy+Div<T,T>+
     }
 
     if special {
-        if buf == str::inf_buf || buf == str::positive_inf_buf {
+        if buf == inf_buf || buf == positive_inf_buf {
             return NumStrConv::inf();
-        } else if buf == str::negative_inf_buf {
+        } else if buf == negative_inf_buf {
             if negative {
                 return NumStrConv::neg_inf();
             } else {
                 return None;
             }
-        } else if buf == str::nan_buf {
+        } else if buf == nan_buf {
             return NumStrConv::NaN();
         }
     }

trunk/src/libcore/str.rs

@@ -1919,14 +1919,6 @@ static tag_five_b: uint = 248u;
 static max_five_b: uint = 67108864u;
 static tag_six_b: uint = 252u;
 
-// Constants used for converting strs to floats
-pub static inf_buf: [u8*3] = ['i' as u8, 'n' as u8, 'f' as u8];
-pub static positive_inf_buf: [u8*4] = ['+' as u8, 'i' as u8,
-                                       'n' as u8, 'f' as u8];
-pub static negative_inf_buf: [u8*4] = ['-' as u8, 'i' as u8,
-                                       'n' as u8, 'f' as u8];
-pub static nan_buf: [u8*3] = ['N' as u8, 'a' as u8, 'N' as u8];
-
 /**
  * Work with the byte buffer of a string.
  *

trunk/src/librustc/middle/borrowck/gather_loans.rs

@@ -145,7 +145,7 @@ fn req_loans_in_expr(ex: @ast::expr,
 
         // make sure that the thing we are pointing out stays valid
         // for the lifetime `scope_r` of the resulting ptr:
-        let scope_r = ty_region(tcx, ex.span, tcx.ty(ex));
+        let scope_r = ty_region(tcx.ty(ex));
         self.guarantee_valid(base_cmt, mutbl, scope_r);
         visit::visit_expr(ex, self, vt);
       }
@@ -599,8 +599,7 @@ pub impl GatherLoanCtxt {
                     // find the region of the resulting pointer (note that
                     // the type of such a pattern will *always* be a
                     // region pointer)
-                    let scope_r = ty_region(self.tcx(), pat.span,
-                                            self.tcx().ty(pat));
+                    let scope_r = ty_region(self.tcx().ty(pat));
 
                     // if the scope of the region ptr turns out to be
                     // specific to this arm, wrap the categorization with

trunk/src/librustc/middle/ty.rs

@@ -2794,18 +2794,13 @@ pub fn ty_vstore(ty: t) -> vstore {
     }
 }
 
-pub fn ty_region(tcx: ctxt,
-                 span: span,
-                 ty: t) -> Region {
+pub fn ty_region(ty: t) -> Region {
     match get(ty).sty {
-        ty_rptr(r, _) => r,
-        ty_evec(_, vstore_slice(r)) => r,
-        ty_estr(vstore_slice(r)) => r,
-        ref s => {
-            tcx.sess.span_bug(
-                span,
-                fmt!("ty_region() invoked on in appropriate ty: %?", s));
-        }
+      ty_rptr(r, _) => r,
+      ty_evec(_, vstore_slice(r)) => r,
+      ty_estr(vstore_slice(r)) => r,
+      ref s => fail!(fmt!("ty_region() invoked on in appropriate ty: %?",
+          (*s)))
     }
 }
 

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

@@ -616,9 +616,8 @@ pub mod guarantor {
         // mk_subr should never fail.
         let rptr_ty = rcx.resolve_node_type(id);
         if !ty::type_is_error(rptr_ty) {
-            let tcx = rcx.fcx.ccx.tcx;
-            debug!("rptr_ty=%s", ty_to_str(tcx, rptr_ty));
-            let r = ty::ty_region(tcx, span, rptr_ty);
+            debug!("rptr_ty=%s", ty_to_str(rcx.fcx.ccx.tcx, rptr_ty));
+            let r = ty::ty_region(rptr_ty);
             infallibly_mk_subr(rcx, true, span, r, bound);
         }
     }
@@ -891,7 +890,7 @@ pub mod guarantor {
             ast::pat_region(p) => {
                 let rptr_ty = rcx.resolve_node_type(pat.id);
                 if !ty::type_is_error(rptr_ty) {
-                    let r = ty::ty_region(rcx.fcx.tcx(), pat.span, rptr_ty);
+                    let r = ty::ty_region(rptr_ty);
                     link_ref_bindings_in_pat(rcx, p, Some(r));
                 }
             }