---

yaml
---
r: 65009
b: refs/heads/snap-stage3
c: eab749a
h: refs/heads/master
i:
  65007: 09ee8a9
v: v3

Author: toddaaro

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: deddb009f0003734d3c73fa859826d57ec600270
+refs/heads/snap-stage3: eab749a5f326b0cab3a1f71f260a35c96d263758
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libstd/logging.rs

@@ -85,6 +85,16 @@ pub fn log_type<T>(level: u32, object: &T) {
 fn newsched_log_str(msg: ~str) {
     use rt::task::Task;
     use rt::local::Local;
+    use str::StrSlice;
+    use container::Container;
+
+    // Truncate the string
+    let buf_bytes = 2048;
+    let msg = if msg.len() > buf_bytes {
+        msg.slice(0, buf_bytes) + "[...]"
+    } else {
+        msg
+    };
 
     unsafe {
         match Local::try_unsafe_borrow::<Task>() {

branches/snap-stage3/src/test/run-fail/assert-macro-explicit.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern:task failed at 'assertion failed: false'
+// error-pattern:failed at 'assertion failed: false'
 
 fn main() {
     assert!(false);

branches/snap-stage3/src/test/run-fail/assert-macro-fmt.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern:task failed at 'test-assert-fmt 42 rust'
+// error-pattern:failed at 'test-assert-fmt 42 rust'
 
 fn main() {
     assert!(false, "test-assert-fmt %d %s", 42, "rust");

branches/snap-stage3/src/test/run-fail/assert-macro-owned.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern:task failed at 'test-assert-owned'
+// error-pattern:failed at 'test-assert-owned'
 
 fn main() {
     assert!(false, ~"test-assert-owned");

branches/snap-stage3/src/test/run-fail/assert-macro-static.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern:task failed at 'test-assert-static'
+// error-pattern:failed at 'test-assert-static'
 
 fn main() {
     assert!(false, "test-assert-static");

branches/snap-stage3/src/test/run-fail/fail-macro-explicit.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern:task failed at 'explicit failure'
+// error-pattern:failed at 'explicit failure'
 
 fn main() {
     fail!();

branches/snap-stage3/src/test/run-fail/fail-macro-fmt.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern:task failed at 'test-fail-fmt 42 rust'
+// error-pattern:failed at 'test-fail-fmt 42 rust'
 
 fn main() {
     fail!("test-fail-fmt %d %s", 42, "rust");

branches/snap-stage3/src/test/run-fail/fail-macro-owned.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern:task failed at 'test-fail-owned'
+// error-pattern:failed at 'test-fail-owned'
 
 fn main() {
     fail!("test-fail-owned");

branches/snap-stage3/src/test/run-fail/fail-macro-static.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern:task failed at 'test-fail-static'
+// error-pattern:failed at 'test-fail-static'
 
 fn main() {
     fail!("test-fail-static");