about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-04-18 23:36:33 -0700
committerbors <bors@rust-lang.org>2014-04-18 23:36:33 -0700
commit5a2ecb828bec0465a801b8c843f928ddccb2228f (patch)
treef7c04a3aa09ecf88a7c122ea1f936b20a4d88365
parent9d5082e88a11f1daf66f062eb061efcee54718a0 (diff)
parent031212bfd9aadd5e77fef0f5b48ad0d6c81ad6d5 (diff)
downloadrust-5a2ecb828bec0465a801b8c843f928ddccb2228f.tar.gz
rust-5a2ecb828bec0465a801b8c843f928ddccb2228f.zip
auto merge of #13608 : tbu-/rust/pr_smallesthello, r=alexcrichton
It now hands `puts` a zero-terminated string, like it expects.

Fix #13603.
-rw-r--r--src/test/run-pass/smallest-hello-world.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/run-pass/smallest-hello-world.rs b/src/test/run-pass/smallest-hello-world.rs
index 65288cf0416..b95f0769d53 100644
--- a/src/test/run-pass/smallest-hello-world.rs
+++ b/src/test/run-pass/smallest-hello-world.rs
@@ -26,7 +26,7 @@ pub extern fn rust_stack_exhausted() {}
 #[no_split_stack]
 fn main(_: int, _: **u8) -> int {
     unsafe {
-        let (ptr, _): (*u8, uint) = transmute("Hello!");
+        let (ptr, _): (*u8, uint) = transmute("Hello!\0");
         puts(ptr);
     }
     return 0;