---

yaml
---
r: 83494
b: refs/heads/try
c: 99c1fb8
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 0e4d1fc8cae42e15e00f71d9f439b01bb25a86ae
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 6c08cc2db4f98e9f07ae7d50338396c4123c2f0a
-refs/heads/try: 1434b4bfcafe90cffa6627e3be18a9e5b6501ad1
+refs/heads/try: 99c1fb8c661134e80df9e87e6c8fd5b4258293e9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/Makefile.in

@@ -141,11 +141,11 @@ endif
 
 # version-string calculation
 CFG_GIT_DIR := $(CFG_SRC_DIR).git
-CFG_RELEASE = 0.8
+CFG_RELEASE = 0.9-pre
 CFG_VERSION = $(CFG_RELEASE)
 # windows exe's need numeric versions - don't use anything but
 # numbers and dots here
-CFG_VERSION_WIN = 0.8
+CFG_VERSION_WIN = 0.9
 
 ifneq ($(wildcard $(CFG_GIT)),)
 ifneq ($(wildcard $(CFG_GIT_DIR)),)

branches/try/src/etc/kate/rust.xml

@@ -7,7 +7,7 @@
 	<!ENTITY rustIdent "[a-zA-Z_][a-zA-Z_0-9]*">
 	<!ENTITY rustIntSuf "([iu](8|16|32|64)?)?">
 ]>
-<language name="Rust" version="0.8" kateversion="2.4" section="Sources" extensions="*.rs;*.rc" mimetype="text/x-rust" priority="15">
+<language name="Rust" version="0.9-pre" kateversion="2.4" section="Sources" extensions="*.rs;*.rc" mimetype="text/x-rust" priority="15">
 <highlighting>
 	<list name="fn">
 		<item> fn </item>

branches/try/src/libextra/extra.rs

@@ -21,7 +21,7 @@ Rust extras are part of the standard Rust distribution.
 */
 
 #[link(name = "extra",
-       vers = "0.8",
+       vers = "0.9-pre",
        uuid = "122bed0b-c19b-4b82-b0b7-7ae8aead7297",
        url = "https://github.com/mozilla/rust/tree/master/src/libextra")];
 

branches/try/src/librust/rust.rs

@@ -13,7 +13,7 @@
 // FIXME #2238 Make run only accept source that emits an executable
 
 #[link(name = "rust",
-       vers = "0.8",
+       vers = "0.9-pre",
        uuid = "4a24da33-5cc8-4037-9352-2cbe9bd9d27c",
        url = "https://github.com/mozilla/rust/tree/master/src/rust")];
 

branches/try/src/librustc/front/std_inject.rs

@@ -20,7 +20,7 @@ use syntax::fold::ast_fold;
 use syntax::fold;
 use syntax::opt_vec;
 
-static STD_VERSION: &'static str = "0.8";
+static STD_VERSION: &'static str = "0.9-pre";
 
 pub fn maybe_inject_libstd_ref(sess: Session, crate: @ast::Crate)
                                -> @ast::Crate {

branches/try/src/librustc/front/test.rs

@@ -279,7 +279,7 @@ fn mk_std(cx: &TestCtxt) -> ast::view_item {
                                             path_node(~[id_extra]),
                                             ast::DUMMY_NODE_ID))])
     } else {
-        let mi = attr::mk_name_value_item_str(@"vers", @"0.8");
+        let mi = attr::mk_name_value_item_str(@"vers", @"0.9-pre");
         ast::view_item_extern_mod(id_extra, None, ~[mi], ast::DUMMY_NODE_ID)
     };
     ast::view_item {

branches/try/src/librustc/rustc.rs

@@ -9,7 +9,7 @@
 // except according to those terms.
 
 #[link(name = "rustc",
-       vers = "0.8",
+       vers = "0.9-pre",
        uuid = "0ce89b41-2f92-459e-bbc1-8f5fe32f16cf",
        url = "https://github.com/mozilla/rust/tree/master/src/rustc")];
 

branches/try/src/librustdoc/rustdoc.rs

@@ -9,7 +9,7 @@
 // except according to those terms.
 
 #[link(name = "rustdoc",
-       vers = "0.8",
+       vers = "0.9-pre",
        uuid = "8c6e4598-1596-4aa5-a24c-b811914bbbc6",
        url = "https://github.com/mozilla/rust/tree/master/src/librustdoc")];
 

branches/try/src/librusti/rusti.rs

@@ -59,7 +59,7 @@
  */
 
 #[link(name = "rusti",
-       vers = "0.8",
+       vers = "0.9-pre",
        uuid = "7fb5bf52-7d45-4fee-8325-5ad3311149fc",
        url = "https://github.com/mozilla/rust/tree/master/src/rusti")];
 

branches/try/src/librustpkg/rustpkg.rs

@@ -11,7 +11,7 @@
 // rustpkg - a package manager and build system for Rust
 
 #[link(name = "rustpkg",
-       vers = "0.8",
+       vers = "0.9-pre",
        uuid = "25de5e6e-279e-4a20-845c-4cabae92daaf",
        url = "https://github.com/mozilla/rust/tree/master/src/librustpkg")];
 

branches/try/src/libstd/logging.rs

@@ -10,11 +10,11 @@
 
 //! Logging
 
-use fmt;
 use option::*;
 use os;
 use rt;
 use rt::logging::{Logger, StdErrLogger};
+use send_str::SendStrOwned;
 
 /// Turns on logging to stdout globally
 pub fn console_on() {
@@ -37,17 +37,7 @@ pub fn console_off() {
     rt::logging::console_off();
 }
 
-#[cfg(stage0)]
-#[doc(hidden)]
-pub fn log(_level: u32, s: ~str) {
-    // this is a terrible approximation, but it gets the job done (for stage0 at
-    // least)
-    ::io::println(s);
-}
-
-#[allow(missing_doc)]
-#[cfg(not(stage0))]
-pub fn log(_level: u32, args: &fmt::Arguments) {
+fn newsched_log_str(msg: ~str) {
     use rt::task::Task;
     use rt::local::Local;
 
@@ -56,13 +46,20 @@ pub fn log(_level: u32, args: &fmt::Arguments) {
         match optional_task {
             Some(local) => {
                 // Use the available logger
-                (*local).logger.log(args);
+                (*local).logger.log(SendStrOwned(msg));
             }
             None => {
                 // There is no logger anywhere, just write to stderr
                 let mut logger = StdErrLogger;
-                logger.log(args);
+                logger.log(SendStrOwned(msg));
             }
         }
     }
 }
+
+// XXX: This will change soon to not require an allocation. This is an unstable
+//      api which should not be used outside of the macros in ext/expand.
+#[doc(hidden)]
+pub fn log(_level: u32, msg: ~str) {
+    newsched_log_str(msg);
+}

branches/try/src/libstd/rt/logging.rs

@@ -7,12 +7,9 @@
 // <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.
-
-use fmt;
 use from_str::from_str;
-use libc::{uintptr_t, exit};
+use libc::{uintptr_t, exit, STDERR_FILENO};
 use option::{Some, None, Option};
-use rt;
 use rt::util::dumb_println;
 use rt::crate_map::{ModEntry, iter_crate_map};
 use rt::crate_map::get_crate_map;
@@ -21,6 +18,7 @@ use str::raw::from_c_str;
 use u32;
 use vec::ImmutableVector;
 use cast::transmute;
+use send_str::{SendStr, SendStrOwned, SendStrStatic};
 
 struct LogDirective {
     name: Option<~str>,
@@ -173,33 +171,44 @@ fn update_log_settings(crate_map: *u8, settings: ~str) {
 }
 
 pub trait Logger {
-    fn log(&mut self, args: &fmt::Arguments);
+    fn log(&mut self, msg: SendStr);
 }
 
 pub struct StdErrLogger;
 
 impl Logger for StdErrLogger {
-    fn log(&mut self, args: &fmt::Arguments) {
-        if should_log_console() {
-            fmt::write(self as &mut rt::io::Writer, args);
+    fn log(&mut self, msg: SendStr) {
+        use io::{Writer, WriterUtil};
+
+        if !should_log_console() {
+            return;
         }
-    }
-}
 
-impl rt::io::Writer for StdErrLogger {
-    fn write(&mut self, buf: &[u8]) {
-        // Nothing like swapping between I/O implementations! In theory this
-        // could use the libuv bindings for writing to file descriptors, but
-        // that may not necessarily be desirable because logging should work
-        // outside of the uv loop. (modify with caution)
-        use io::Writer;
-        let dbg = ::libc::STDERR_FILENO as ::io::fd_t;
-        dbg.write(buf);
+        let s: &str = match msg {
+            SendStrOwned(ref s) => {
+                let slc: &str = *s;
+                slc
+            },
+            SendStrStatic(s) => s,
+        };
+
+        // Truncate the string
+        let buf_bytes = 2048;
+        if s.len() > buf_bytes {
+            let s = s.slice(0, buf_bytes) + "[...]";
+            print(s);
+        } else {
+            print(s)
+        };
+
+        fn print(s: &str) {
+            let dbg = STDERR_FILENO as ::io::fd_t;
+            dbg.write_str(s);
+            dbg.write_str("\n");
+            dbg.flush();
+        }
     }
-
-    fn flush(&mut self) {}
 }
-
 /// Configure logging by traversing the crate map and setting the
 /// per-module global logging flags based on the logging spec
 pub fn init() {

branches/try/src/libstd/std.rs

@@ -49,7 +49,7 @@ they contained the following prologue:
 
 
 #[link(name = "std",
-       vers = "0.8",
+       vers = "0.9-pre",
        uuid = "c70c24a7-5551-4f73-8e37-380b11d80be8",
        url = "https://github.com/mozilla/rust/tree/master/src/libstd")];
 
@@ -67,7 +67,7 @@ they contained the following prologue:
 #[deny(missing_doc)];
 
 // Make extra accessible for benchmarking
-#[cfg(test)] extern mod extra(vers="0.8");
+#[cfg(test)] extern mod extra(vers="0.9-pre");
 
 // Make std testable by not duplicating lang items. See #2912
 #[cfg(test)] extern mod realstd(name = "std");
@@ -223,5 +223,4 @@ mod std {
     pub use os;
     pub use fmt;
     pub use to_bytes;
-    pub use logging;
 }

branches/try/src/libstd/sys.rs

@@ -125,56 +125,37 @@ impl FailWithCause for &'static str {
     }
 }
 
-// This stage0 version is incredibly wrong.
-#[cfg(stage0)]
-pub fn begin_unwind_(msg: *c_char, file: *c_char, line: size_t) -> ! {
-    use option::{Some, None};
-    use rt::in_green_task_context;
-    use rt::task::Task;
-    use rt::local::Local;
-    use rt::logging::Logger;
-    use str::Str;
-
-    unsafe {
-        let msg = str::raw::from_c_str(msg);
-        let file = str::raw::from_c_str(file);
-        if in_green_task_context() {
-            rterrln!("task failed at '%s', %s:%i", msg, file, line as int);
-        } else {
-            rterrln!("failed in non-task context at '%s', %s:%i",
-                     msg, file, line as int);
-        }
-
-        let task: *mut Task = Local::unsafe_borrow();
-        if (*task).unwinder.unwinding {
-            rtabort!("unwinding again");
-        }
-        (*task).unwinder.begin_unwind();
-    }
-}
-
 // FIXME #4427: Temporary until rt::rt_fail_ goes away
-#[cfg(not(stage0))]
 pub fn begin_unwind_(msg: *c_char, file: *c_char, line: size_t) -> ! {
+    use option::{Some, None};
     use rt::in_green_task_context;
     use rt::task::Task;
     use rt::local::Local;
     use rt::logging::Logger;
+    use send_str::SendStrOwned;
     use str::Str;
 
     unsafe {
         // XXX: Bad re-allocations. fail! needs some refactoring
         let msg = str::raw::from_c_str(msg);
         let file = str::raw::from_c_str(file);
 
+        // XXX: Logging doesn't work correctly in non-task context because it
+        // invokes the local heap
         if in_green_task_context() {
-            // Be careful not to allocate in this block, if we're failing we may
-            // have been failing due to a lack of memory in the first place...
+            // XXX: Logging doesn't work here - the check to call the log
+            // function never passes - so calling the log function directly.
             do Local::borrow |task: &mut Task| {
-                let n = task.name.map(|n| n.as_slice()).unwrap_or("<unnamed>");
-                format_args!(|args| { task.logger.log(args) },
-                             "task '{}' failed at '{}', {}:{}",
-                             n, msg.as_slice(), file.as_slice(), line);
+                let msg = match task.name {
+                    Some(ref name) =>
+                    fmt!("task '%s' failed at '%s', %s:%i",
+                         name.as_slice(), msg, file, line as int),
+                    None =>
+                    fmt!("task <unnamed> failed at '%s', %s:%i",
+                         msg, file, line as int)
+                };
+
+                task.logger.log(SendStrOwned(msg));
             }
         } else {
             rterrln!("failed in non-task context at '%s', %s:%i",

branches/try/src/libsyntax/ext/expand.rs

@@ -813,17 +813,13 @@ pub fn std_macros() -> @str {
         ($lvl:expr, $arg:expr) => ({
             let lvl = $lvl;
             if lvl <= __log_level() {
-                format_args!(|args| {
-                    ::std::logging::log(lvl, args)
-                }, \"{}\", fmt!(\"%?\", $arg))
+                ::std::logging::log(lvl, fmt!(\"%?\", $arg))
             }
         });
         ($lvl:expr, $($arg:expr),+) => ({
             let lvl = $lvl;
             if lvl <= __log_level() {
-                format_args!(|args| {
-                    ::std::logging::log(lvl, args)
-                }, \"{}\", fmt!($($arg),+))
+                ::std::logging::log(lvl, fmt!($($arg),+))
             }
         })
     )
@@ -838,9 +834,7 @@ pub fn std_macros() -> @str {
         ($lvl:expr, $($arg:tt)+) => ({
             let lvl = $lvl;
             if lvl <= __log_level() {
-                format_args!(|args| {
-                    ::std::logging::log(lvl, args)
-                }, $($arg)+)
+                ::std::logging::log(lvl, format!($($arg)+))
             }
         })
     )

branches/try/src/libsyntax/syntax.rs

@@ -14,7 +14,7 @@
  */
 
 #[link(name = "syntax",
-       vers = "0.8",
+       vers = "0.9-pre",
        uuid = "9311401b-d6ea-4cd9-a1d9-61f89499c645")];
 
 #[license = "MIT/ASL2"];

branches/try/src/test/compile-fail/issue-2823.rs

@@ -20,5 +20,6 @@ impl Drop for C {
 
 fn main() {
     let c = C{ x: 2};
-    let _d = c.clone(); //~ ERROR does not implement any method in scope
+    let d = c.clone(); //~ ERROR does not implement any method in scope
+    error!("%?", d.x);
 }