---

yaml
---
r: 146147
b: refs/heads/try2
c: e2428b7
h: refs/heads/master
i:
  146145: ecda146
  146143: 94485fb
v: v3

Author: bors

[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: 142672dca4314e9cfebf067d46c3b542c721cff6
+refs/heads/try2: e2428b791c5a4074ca712ab3b145ee05c2d67ead
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libextra/base64.rs

@@ -318,7 +318,7 @@ mod test {
         use std::vec;
 
         do 1000.times {
-            let times = task_rng().gen_integer_range(1u, 100);
+            let times = task_rng().gen_range(1u, 100);
             let v = vec::from_fn(times, |_| random::<u8>());
             assert_eq!(v.to_base64(STANDARD).from_base64().unwrap(), v);
         }

branches/try2/src/libextra/crypto/cryptoutil.rs

@@ -365,7 +365,7 @@ pub mod test {
         digest.reset();
 
         while count < total_size {
-            let next: uint = rng.gen_integer_range(0, 2 * blocksize + 1);
+            let next: uint = rng.gen_range(0, 2 * blocksize + 1);
             let remaining = total_size - count;
             let size = if next > remaining { remaining } else { next };
             digest.input(buffer.slice_to(size));

branches/try2/src/libextra/flate.rs

@@ -113,7 +113,7 @@ mod tests {
         let mut r = rand::rng();
         let mut words = ~[];
         do 20.times {
-            let range = r.gen_integer_range(1u, 10);
+            let range = r.gen_range(1u, 10);
             words.push(r.gen_vec::<u8>(range));
         }
         do 20.times {

branches/try2/src/libextra/sort.rs

@@ -1069,8 +1069,8 @@ mod big_tests {
             isSorted(arr);
 
             do 3.times {
-                let i1 = rng.gen_integer_range(0u, n);
-                let i2 = rng.gen_integer_range(0u, n);
+                let i1 = rng.gen_range(0u, n);
+                let i2 = rng.gen_range(0u, n);
                 arr.swap(i1, i2);
             }
             tim_sort(arr); // 3sort
@@ -1088,7 +1088,7 @@ mod big_tests {
             isSorted(arr);
 
             do (n/100).times {
-                let idx = rng.gen_integer_range(0u, n);
+                let idx = rng.gen_range(0u, n);
                 arr[idx] = rng.gen();
             }
             tim_sort(arr);
@@ -1141,8 +1141,8 @@ mod big_tests {
             isSorted(arr);
 
             do 3.times {
-                let i1 = rng.gen_integer_range(0u, n);
-                let i2 = rng.gen_integer_range(0u, n);
+                let i1 = rng.gen_range(0u, n);
+                let i2 = rng.gen_range(0u, n);
                 arr.swap(i1, i2);
             }
             tim_sort(arr); // 3sort
@@ -1160,7 +1160,7 @@ mod big_tests {
             isSorted(arr);
 
             do (n/100).times {
-                let idx = rng.gen_integer_range(0u, n);
+                let idx = rng.gen_range(0u, n);
                 arr[idx] = @rng.gen();
             }
             tim_sort(arr);

branches/try2/src/libextra/time.rs

@@ -34,7 +34,7 @@ pub mod rustrt {
 
 
 #[deriving(Clone, DeepClone, Eq, Encodable, Decodable)]
-pub struct Timespec { priv sec: i64, priv nsec: i32 }
+pub struct Timespec { sec: i64, nsec: i32 }
 /*
  * Timespec assumes that pre-epoch Timespecs have negative sec and positive
  * nsec fields. Darwin's and Linux's struct timespec functions handle pre-
@@ -106,18 +106,18 @@ pub fn tzset() {
 
 #[deriving(Clone, DeepClone, Eq, Encodable, Decodable)]
 pub struct Tm {
-    priv tm_sec: i32, // seconds after the minute ~[0-60]
-    priv tm_min: i32, // minutes after the hour ~[0-59]
-    priv tm_hour: i32, // hours after midnight ~[0-23]
-    priv tm_mday: i32, // days of the month ~[1-31]
-    priv tm_mon: i32, // months since January ~[0-11]
-    priv tm_year: i32, // years since 1900
-    priv tm_wday: i32, // days since Sunday ~[0-6]
-    priv tm_yday: i32, // days since January 1 ~[0-365]
-    priv tm_isdst: i32, // Daylight Savings Time flag
-    priv tm_gmtoff: i32, // offset from UTC in seconds
-    priv tm_zone: ~str, // timezone abbreviation
-    priv tm_nsec: i32, // nanoseconds
+    tm_sec: i32, // seconds after the minute ~[0-60]
+    tm_min: i32, // minutes after the hour ~[0-59]
+    tm_hour: i32, // hours after midnight ~[0-23]
+    tm_mday: i32, // days of the month ~[1-31]
+    tm_mon: i32, // months since January ~[0-11]
+    tm_year: i32, // years since 1900
+    tm_wday: i32, // days since Sunday ~[0-6]
+    tm_yday: i32, // days since January 1 ~[0-365]
+    tm_isdst: i32, // Daylight Savings Time flag
+    tm_gmtoff: i32, // offset from UTC in seconds
+    tm_zone: ~str, // timezone abbreviation
+    tm_nsec: i32, // nanoseconds
 }
 
 pub fn empty_tm() -> Tm {

branches/try2/src/libextra/treemap.rs

@@ -1028,7 +1028,7 @@ mod test_treemap {
             }
 
             do 30.times {
-                let r = rng.gen_integer_range(0, ctrl.len());
+                let r = rng.gen_range(0, ctrl.len());
                 let (key, _) = ctrl.remove(r);
                 assert!(map.remove(&key));
                 check_structure(&map);

branches/try2/src/librustpkg/conditions.rs

@@ -12,15 +12,14 @@
 
 pub use std::path::Path;
 pub use package_id::PkgId;
-pub use std::libc;
-pub use std::libc::stat;
+pub use std::rt::io::FileStat;
 
 condition! {
     pub bad_path: (Path, ~str) -> Path;
 }
 
 condition! {
-    pub bad_stat: (Path, ~str) -> stat;
+    pub bad_stat: (Path, ~str) -> FileStat;
 }
 
 condition! {

branches/try2/src/librustpkg/util.rs

@@ -1,4 +1,4 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -625,7 +625,7 @@ fn debug_flags() -> ~[~str] { ~[] }
 /// Returns the last-modified date as an Option
 pub fn datestamp(p: &Path) -> Option<libc::time_t> {
     debug!("Scrutinizing datestamp for {} - does it exist? {:?}", p.display(), os::path_exists(p));
-    let out = p.stat().map(|stat| stat.st_mtime);
+    let out = p.stat().map(|stat| stat.modified);
     debug!("Date = {:?}", out);
     out.map(|t| { t as libc::time_t })
 }

branches/try2/src/librustpkg/workcache_support.rs

@@ -18,17 +18,17 @@ pub fn digest_file_with_date(path: &Path) -> ~str {
     use conditions::bad_path::cond;
     use cond1 = conditions::bad_stat::cond;
 
-    let mut sha = ~Sha1::new();
     let s = io::read_whole_file_str(path);
     match s {
         Ok(s) => {
-            (*sha).input_str(s);
+            let mut sha = Sha1::new();
+            sha.input_str(s);
             let st = match path.stat() {
                 Some(st) => st,
                 None => cond1.raise((path.clone(), format!("Couldn't get file access time")))
             };
-            (*sha).input_str(st.st_mtime.to_str());
-            (*sha).result_str()
+            sha.input_str(st.modified.to_str());
+            sha.result_str()
         }
         Err(e) => {
             let path = cond.raise((path.clone(), format!("Couldn't read file: {}", e)));
@@ -43,13 +43,13 @@ pub fn digest_file_with_date(path: &Path) -> ~str {
 pub fn digest_only_date(path: &Path) -> ~str {
     use cond = conditions::bad_stat::cond;
 
-    let mut sha = ~Sha1::new();
+    let mut sha = Sha1::new();
     let st = match path.stat() {
                 Some(st) => st,
                 None => cond.raise((path.clone(), format!("Couldn't get file access time")))
     };
-    (*sha).input_str(st.st_mtime.to_str());
-    (*sha).result_str()
+    sha.input_str(st.modified.to_str());
+    sha.result_str()
 }
 
 /// Adds multiple discovered outputs