---

yaml
---
r: 89884
b: refs/heads/master
c: 5d466ff
h: refs/heads/master
v: v3

Author: emberian

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 2c9e56f0ed96a7ebc9d6a854f64397f715069feb
+refs/heads/master: 5d466ff96ece2e050424a11771ce003488dc2d24
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a6d3e57dca68fde4effdda3e4ae2887aa535fcd6
 refs/heads/try: b160761e35efcd1207112b3b782c06633cf441a8

trunk/src/libextra/url.rs

@@ -364,16 +364,6 @@ fn query_from_str(rawquery: &str) -> Query {
     return query;
 }
 
-/**
- * Converts an instance of a URI `Query` type to a string.
- *
- * # Example
- *
- * ```rust
- * let query = ~[(~"title", ~"The Village"), (~"north", ~"52.91"), (~"west", ~"4.10")];
- * println(query_to_str(&query));  // title=The%20Village&north=52.91&west=4.10
- * ```
- */
 pub fn query_to_str(query: &Query) -> ~str {
     let mut strvec = ~[];
     for kv in query.iter() {

trunk/src/test/bench/shootout-mandelbrot.rs

@@ -1,79 +1,64 @@
-// 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.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
+// xfail-test reading from os::args()[1] - bogus!
 
-use std::io::buffered::BufferedWriter;
+use std::cast::transmute;
+use std::from_str::FromStr;
+use std::libc::{STDOUT_FILENO, c_int, fdopen, fputc};
+use std::os;
 
-struct DummyWriter;
-impl Writer for DummyWriter {
-    fn write(&mut self, _: &[u8]) {}
-}
-
-static ITER: int = 50;
+static ITER: uint = 50;
 static LIMIT: f64 = 2.0;
 
 fn main() {
-    let args = std::os::args();
-    let (w, mut out) = if args.len() < 2 {
-        println("Test mode: do not dump the image because it's not utf8, \
-                which interferes with the test runner.");
-        (1000, ~DummyWriter as ~Writer)
-    } else {
-        (from_str(args[1]).unwrap(),
-         ~BufferedWriter::new(std::io::stdout()) as ~Writer)
-    };
-    let h = w;
-    let mut byte_acc = 0u8;
-    let mut bit_num = 0;
+    unsafe {
+        let w: i32 = FromStr::from_str(os::args()[1]).unwrap();
+        let h = w;
+        let mut byte_acc: i8 = 0;
+        let mut bit_num: i32 = 0;
 
-    writeln!(out, "P4\n{} {}", w, h);
+        println!("P4\n{} {}", w, h);
 
-    for y in range(0, h) {
-        let y = y as f64;
-        for x in range(0, w) {
-            let mut z_r = 0f64;
-            let mut z_i = 0f64;
-            let mut t_r = 0f64;
-            let mut t_i = 0f64;
-            let c_r = 2.0 * (x as f64) / (w as f64) - 1.5;
-            let c_i = 2.0 * (y as f64) / (h as f64) - 1.0;
+        let mode = "w";
+        let stdout = fdopen(STDOUT_FILENO as c_int, transmute(&mode[0]));
 
-            for _ in range(0, ITER) {
-                if t_r + t_i > LIMIT * LIMIT {
-                    break;
-                }
+        for y in range(0i32, h) {
+            let y = y as f64;
+            for x in range(0i32, w) {
+                let mut Zr = 0f64;
+                let mut Zi = 0f64;
+                let mut Tr = 0f64;
+                let mut Ti = 0f64;
+                let Cr = 2.0 * (x as f64) / (w as f64) - 1.5;
+                let Ci = 2.0 * (y as f64) / (h as f64) - 1.0;
 
-                z_i = 2.0 * z_r * z_i + c_i;
-                z_r = t_r - t_i + c_r;
-                t_r = z_r * z_r;
-                t_i = z_i * z_i;
-            }
+                for _ in range(0i32, ITER as i32) {
+                    if Tr + Ti > LIMIT * LIMIT {
+                        break;
+                    }
 
-            byte_acc <<= 1;
-            if t_r + t_i <= LIMIT * LIMIT {
-                byte_acc |= 1;
-            }
+                    Zi = 2.0*Zr*Zi + Ci;
+                    Zr = Tr - Ti + Cr;
+                    Tr = Zr * Zr;
+                    Ti = Zi * Zi;
+                }
+
+                byte_acc <<= 1;
+                if Tr + Ti <= LIMIT * LIMIT {
+                    byte_acc |= 1;
+                }
 
-            bit_num += 1;
+                bit_num += 1;
 
-            if bit_num == 8 {
-                out.write_u8(byte_acc);
-                byte_acc = 0;
-                bit_num = 0;
-            } else if x == w - 1 {
-                byte_acc <<= 8 - w % 8;
-                out.write_u8(byte_acc);
-                byte_acc = 0;
-                bit_num = 0;
+                if bit_num == 8 {
+                    fputc(byte_acc as c_int, stdout);
+                    byte_acc = 0;
+                    bit_num = 0;
+                } else if x == w - 1 {
+                    byte_acc <<= 8 - w%8;
+                    fputc(byte_acc as c_int, stdout);
+                    byte_acc = 0;
+                    bit_num = 0;
+                }
             }
         }
     }
-
-    out.flush();
 }

trunk/src/test/run-pass/deriving-in-macro.rs

@@ -0,0 +1,24 @@
+// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#[feature(macro_rules)];
+
+macro_rules! define_vec (
+    () => (
+        mod foo {
+            #[deriving(Eq)]
+            pub struct bar;
+        }
+    )
+)
+
+define_vec!()
+
+pub fn main() {}