about summary refs log tree commit diff
diff options
context:
space:
mode:
authorBrian Anderson <andersrb@gmail.com>2011-03-31 21:18:23 -0400
committerBrian Anderson <andersrb@gmail.com>2011-03-31 23:15:11 -0400
commitbd1c61548ec2ddde4d85dbef88eed6627b536d13 (patch)
tree2199f2e3935df68d87122b34ea84ed6a3284422c
parentd631f29d47578c46bfc01e1a8cc021b295866e0c (diff)
downloadrust-bd1c61548ec2ddde4d85dbef88eed6627b536d13.tar.gz
rust-bd1c61548ec2ddde4d85dbef88eed6627b536d13.zip
Move str test from expr-if.rs to expr-if-box.rs in preperation for breaking that code path.
-rw-r--r--src/test/run-pass/expr-if-box.rs8
-rw-r--r--src/test/run-pass/expr-if.rs6
2 files changed, 7 insertions, 7 deletions
diff --git a/src/test/run-pass/expr-if-box.rs b/src/test/run-pass/expr-if-box.rs
index 98503211fc2..30dce957235 100644
--- a/src/test/run-pass/expr-if-box.rs
+++ b/src/test/run-pass/expr-if-box.rs
@@ -9,6 +9,12 @@ fn test_box() {
   check (*res == 100);
 }
 
+fn test_str() {
+  auto res = if (true) { "happy" } else { "sad" };
+  check (res == "happy");
+}
+
 fn main() {
   test_box();
-}
\ No newline at end of file
+  test_str();
+}
diff --git a/src/test/run-pass/expr-if.rs b/src/test/run-pass/expr-if.rs
index e69a629f9d0..7c99f2ea82e 100644
--- a/src/test/run-pass/expr-if.rs
+++ b/src/test/run-pass/expr-if.rs
@@ -80,11 +80,6 @@ fn test_if_as_block_result() {
   check (res);
 }
 
-fn test_str() {
-  auto res = if (true) { "happy" } else { "sad" };
-  check (res == "happy");
-}
-
 fn main() {
   test_if();
   test_else();
@@ -94,5 +89,4 @@ fn main() {
   test_inferrence();
   test_if_as_if_condition();
   test_if_as_block_result();
-  test_str();
 }