---

yaml
---
r: 42798
b: refs/heads/try
c: 7ad0716
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 19dfec2aaf746535de1521f68421f9980dbf25de
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 2f46b763da2c098913884f101b6d71d69af41b49
-refs/heads/try: b505504dc4ebcc7a6f121163ae510cfb5fd2834f
+refs/heads/try: 7ad071627565fa2b1277c05279cf35c2fe3b1ebf
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278

branches/try/src/libcore/float.rs

@@ -581,15 +581,6 @@ pub fn test_to_str_inf() {
     assert to_str(-infinity, 10u) == ~"-inf";
 }
 
-#[test]
-pub fn test_round() {
-    assert round(5.8) == 6.0;
-    assert round(5.2) == 5.0;
-    assert round(3.0) == 3.0;
-    assert round(2.5) == 3.0;
-    assert round(-3.5) == -4.0;
-}
-
 #[test]
 pub fn test_traits() {
     fn test<U:num::Num cmp::Eq>(ten: &U) {
@@ -618,3 +609,8 @@ pub fn test_traits() {
 // buffer-file-coding-system: utf-8-unix
 // End:
 //
+
+
+
+
+

branches/try/src/librustc/rustc.rc

@@ -357,24 +357,27 @@ fails without recording a fatal error then we've encountered a compiler
 bug and need to present an error.
 */
 pub fn monitor(+f: fn~(diagnostic::emitter)) {
-    let p = oldcomm::Port();
-    let ch = oldcomm::Chan(&p);
-
+    use core::pipes::*;
+    use std::cell::Cell;
+    let (p, ch) = stream();
+    let ch = SharedChan(ch);
+    let ch_capture = ch.clone();
     match do task::try |move f| {
-
+        let ch = ch_capture.clone();
+        let ch_capture = ch.clone();
         // The 'diagnostics emitter'. Every error, warning, etc. should
         // go through this function.
         let demitter = fn@(cmsp: Option<(@codemap::CodeMap, codemap::span)>,
                            msg: &str, lvl: diagnostic::level) {
             if lvl == diagnostic::fatal {
-                oldcomm::send(ch, fatal);
+                ch_capture.send(fatal);
             }
             diagnostic::emit(cmsp, msg, lvl);
         };
 
         struct finally {
-            ch: oldcomm::Chan<monitor_msg>,
-            drop { oldcomm::send(self.ch, done); }
+            ch: SharedChan<monitor_msg>,
+            drop { self.ch.send(done); }
         }
 
         let _finally = finally { ch: ch };
@@ -384,7 +387,7 @@ pub fn monitor(+f: fn~(diagnostic::emitter)) {
         result::Ok(_) => { /* fallthrough */ }
         result::Err(_) => {
             // Task failed without emitting a fatal diagnostic
-            if oldcomm::recv(p) == done {
+            if p.recv() == done {
                 diagnostic::emit(
                     None,
                     diagnostic::ice_msg(~"unexpected failure"),