---

yaml
---
r: 61275
b: refs/heads/try
c: 9af04f3
h: refs/heads/master
i:
  61273: a2cce53
  61271: d030684
v: v3

Author: alexcrichton

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 2d28d645422c1617be58c8ca7ad9a457264ca850
-refs/heads/try: 4a9d8ff1a7ee6e832cceb582cb213ac6444f09b6
+refs/heads/try: 9af04f3e77b201d9a33ebfaeaf622aa44e782d71
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/librusti/rusti.rc

@@ -437,21 +437,13 @@ mod tests {
         }
     }
 
-    fn super_simple() {
+    fn run_cmds(cmds: &[&str]) {
         let mut r = repl();
-        let result = run_line(&mut r, io::stdin(), io::stdout(), ~"", false);
-        result.expect("empty input shouldn't fail in rusti");
-    }
-
-    fn use_does_not_crash() {
-        // Regression tests for #5937
-        let mut r = repl();
-        let result = run_line(&mut r, io::stdin(), io::stdout(),
-                              ~"use core::util::with;", false);
-        r = result.expect("use statements should't fail in rusti");
-        let result = run_line(&mut r, io::stdin(), io::stdout(),
-                              ~"", false);
-        result.expect("something should be able to happen after a use statement");
+        for cmds.each |&cmd| {
+            let result = run_line(&mut r, io::stdin(), io::stdout(),
+                                  cmd.to_owned(), false);
+            r = result.expect(fmt!("the command '%s' failed", cmd));
+        }
     }
 
     #[test]
@@ -464,8 +456,17 @@ mod tests {
         //
         // To get some interesting output, run with RUST_LOG=rusti::tests
 
-        debug!("super_simple");       super_simple();
-        debug!("use_does_not_crash"); use_does_not_crash();
+        debug!("hopefully this runs");
+        run_cmds([""]);
+
+        debug!("regression test for #5937");
+        run_cmds(["use core;", ""]);
+
+        debug!("regression test for #5784");
+        run_cmds(["let a = 1;"]);
 
+        debug!("regression test for #5803");
+        run_cmds(["spawn( || println(\"Please don't segfault\") );",
+                  "do spawn { println(\"Please?\"); }"]);
     }
 }