---

yaml
---
r: 145875
b: refs/heads/try2
c: 82f53d6
h: refs/heads/master
i:
  145873: 668c069
  145871: 959784e
v: v3

Author: vmx

[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: 6aa5934e2ba4ec26a3de617c3c05f113690d4086
+refs/heads/try2: 82f53d6dc58903a9842e6f9fc30121f63ba17ee4
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/doc/tutorial-ffi.md

@@ -135,7 +135,7 @@ the true length after compression for setting the length.
 ~~~~ {.xfail-test}
 pub fn compress(src: &[u8]) -> ~[u8] {
     #[fixed_stack_segment]; #[inline(never)];
-
+    
     unsafe {
         let srclen = src.len() as size_t;
         let psrc = vec::raw::to_ptr(src);
@@ -157,7 +157,7 @@ format and `snappy_uncompressed_length` will retrieve the exact buffer size requ
 ~~~~ {.xfail-test}
 pub fn uncompress(src: &[u8]) -> Option<~[u8]> {
     #[fixed_stack_segment]; #[inline(never)];
-
+    
     unsafe {
         let srclen = src.len() as size_t;
         let psrc = vec::raw::to_ptr(src);
@@ -236,7 +236,7 @@ use std::libc::size_t;
 unsafe fn snappy_max_compressed_length(source_length: size_t) -> size_t {
     #[fixed_stack_segment]; #[inline(never)];
     return snappy_max_compressed_length(source_length);
-
+    
     #[link_args = "-lsnappy"]
     extern {
         fn snappy_max_compressed_length(source_length: size_t) -> size_t;
@@ -259,9 +259,9 @@ check that one of the following conditions holds:
 2. The call occurs inside of an `extern fn`;
 3. The call occurs within a stack closure created by some other
    safe fn.
-
+   
 All of these conditions ensure that you are running on a large stack
-segment. However, they are sometimes too strict. If your application
+segmented. However, they are sometimes too strict. If your application
 will be making many calls into C, it is often beneficial to promote
 the `#[fixed_stack_segment]` attribute higher up the call chain.  For
 example, the Rust compiler actually labels main itself as requiring a
@@ -298,7 +298,7 @@ impl<T: Send> Unique<T> {
     pub fn new(value: T) -> Unique<T> {
         #[fixed_stack_segment];
         #[inline(never)];
-
+        
         unsafe {
             let ptr = malloc(std::sys::size_of::<T>() as size_t) as *mut T;
             assert!(!ptr::is_null(ptr));
@@ -324,7 +324,7 @@ impl<T: Send> Drop for Unique<T> {
     fn drop(&mut self) {
         #[fixed_stack_segment];
         #[inline(never)];
-
+        
         unsafe {
             let x = intrinsics::init(); // dummy value to swap in
             // moving the object out is needed to call the destructor

branches/try2/src/libstd/rand/mod.rs

@@ -732,7 +732,7 @@ impl<R: Rng> Rng for @mut R {
 ///         let x = random();
 ///         println!("{}", 2u * x);
 ///     } else {
-///         println!("{}", random::<float>());
+///         println!("{}", random::<f64>());
 ///     }
 /// }
 /// ```

branches/try2/src/snapshots.txt

@@ -1,11 +1,3 @@
-S 2013-10-10 8015f9c
-  freebsd-x86_64 e63594f61d24bec15bc6fa2401fbc76d3651a743
-  linux-i386 7838768d94ba17866ac1e880b896372f08cb48e9
-  linux-x86_64 e7220e9c569a731abdfb4a34ac45974df3f40233
-  macos-i386 37473eb65447e73af9e3bac3b92dcef22f7faa28
-  macos-x86_64 2532e0d87d3f17bbd9daf6ced32d2116261705c4
-  winnt-i386 5471ede56928d92d9042331346de91e4e571ab7e
-
 S 2013-10-07 c919629
   freebsd-x86_64 c9af0c52bdcc1ffe2db4c9a3a1aaae66ff7fcc2c
   linux-i386 0245cb9e57c9b39f3441e9768256783ba76be6e7