---

yaml
---
r: 10399
b: refs/heads/snap-stage3
c: c9bbf73
h: refs/heads/master
i:
  10397: 5c7aea9
  10395: b701dfd
  10391: 62eb246
  10383: 7033862
  10367: eaa0182
v: v3

Author: bstrie

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: 2898dcc5d97da9427ac367542382b6239d9c0bbf
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: fbd583bde2d51dadd87f1b3c74b4723399f7e3b9
+refs/heads/snap-stage3: c9bbf739ebce93a01471ecef80bc2f088e9e98c7
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/snap-stage3/mk/install.mk

@@ -58,7 +58,7 @@ install: all install-host install-targets
 
 # Shorthand for build/stageN/bin
 HB = $(HBIN$(ISTAGE)_H_$(CFG_HOST_TRIPLE))
-HB3 = $(HBIN3_H_$(CFG_HOST_TRIPLE))
+HB3 = $(HBIN2_H_$(CFG_HOST_TRIPLE))
 # Shorthand for build/stageN/lib
 HL = $(HLIB$(ISTAGE)_H_$(CFG_HOST_TRIPLE))
 # Shorthand for the prefix bin directory

branches/snap-stage3/src/README.txt

@@ -6,7 +6,7 @@ rustc/             The self-hosted compiler
 
 libcore/           The core library (imported and linked by default)
 libstd/            The standard library (slightly more peripheral code)
-librustsyntax/     The Rust parser and pretty-printer
+libsyntax/         The Rust parser and pretty-printer
 
 rt/                The runtime system
 rt/rust_*.cpp      - The majority of the runtime services

branches/snap-stage3/src/libcore/cmath.rs

@@ -48,12 +48,10 @@ native mod c_double {
     pure fn frexp(n: c_double, &value: c_int) -> c_double;
     pure fn hypot(x: c_double, y: c_double) -> c_double;
     pure fn ldexp(x: c_double, n: c_int) -> c_double;
-    #[cfg(target_os = "linux")]
-    #[cfg(target_os = "macos")]
-    #[cfg(target_os = "freebsd")]
+    #[cfg(unix)]
     #[link_name="lgamma_r"] pure fn lgamma(n: c_double,
                                            &sign: c_int) -> c_double;
-    #[cfg(target_os = "win32")]
+    #[cfg(windows)]
     #[link_name="__lgamma_r"] pure fn lgamma(n: c_double,
                                              &sign: c_int) -> c_double;
     // renamed: log is a reserved keyword; ln seems more natural, too
@@ -131,13 +129,11 @@ native mod c_float {
     #[link_name="hypotf"] pure fn hypot(x: c_float, y: c_float) -> c_float;
     #[link_name="ldexpf"] pure fn ldexp(x: c_float, n: c_int) -> c_float;
 
-    #[cfg(target_os="linux")]
-    #[cfg(target_os="macos")]
-    #[cfg(target_os="freebsd")]
+    #[cfg(unix)]
     #[link_name="lgammaf_r"] pure fn lgamma(n: c_float,
                                             &sign: c_int) -> c_float;
 
-    #[cfg(target_os="win32")]
+    #[cfg(windows)]
     #[link_name="__lgammaf_r"] pure fn lgamma(n: c_float,
                                               &sign: c_int) -> c_float;
 

branches/snap-stage3/src/libcore/comm.rs

@@ -420,15 +420,15 @@ fn test_recv_chan() {
 
 #[test]
 #[should_fail]
-#[ignore(cfg(target_os = "win32"))]
+#[ignore(cfg(windows))]
 fn test_recv_chan_dead() {
     let ch = chan(port());
     send(ch, "flower");
     recv_chan(ch);
 }
 
 #[test]
-#[ignore(cfg(target_os = "win32"))]
+#[ignore(cfg(windows))]
 fn test_recv_chan_wrong_task() {
     let po = port();
     let ch = chan(po);
@@ -464,7 +464,7 @@ fn test_listen() {
 }
 
 #[test]
-#[ignore(cfg(target_os="win32"))]
+#[ignore(cfg(windows))]
 fn test_port_detach_fail() {
     iter::repeat(100u) {||
         let builder = task::builder();

branches/snap-stage3/src/libcore/io.rs

@@ -398,12 +398,10 @@ fn fd_writer(fd: fd_t, cleanup: bool) -> writer {
 fn mk_file_writer(path: str, flags: [fileflag])
     -> result<writer, str> {
 
-    #[cfg(target_os = "win32")]
+    #[cfg(windows)]
     fn wb() -> c_int { (O_WRONLY | O_BINARY) as c_int }
 
-    #[cfg(target_os = "linux")]
-    #[cfg(target_os = "macos")]
-    #[cfg(target_os = "freebsd")]
+    #[cfg(unix)]
     fn wb() -> c_int { O_WRONLY as c_int }
 
     let mut fflags: c_int = wb();

branches/snap-stage3/src/libcore/iter.rs

@@ -229,7 +229,7 @@ fn test_min() {
 
 #[test]
 #[should_fail]
-#[ignore(cfg(target_os = "win32"))]
+#[ignore(cfg(windows))]
 fn test_min_empty() {
     min::<int, [int]>([]);
 }
@@ -241,7 +241,7 @@ fn test_max() {
 
 #[test]
 #[should_fail]
-#[ignore(cfg(target_os = "win32"))]
+#[ignore(cfg(windows))]
 fn test_max_empty() {
     max::<int, [int]>([]);
 }