---

yaml
---
r: 85934
b: refs/heads/dist-snap
c: 4fea236
h: refs/heads/master
v: v3

Author: huonw

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 0983ebe5310d4eb6d289f636f7ed0536c08bbc0e
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/dist-snap: e835c6b042b88720d5fd0d606d25e0ea4fa27b1a
+refs/heads/dist-snap: 4fea236a85b61b52fc3e16348886ff32f5b8210b
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/libextra/test.rs

@@ -745,7 +745,7 @@ fn get_concurrency() -> uint {
             let opt_n: Option<uint> = FromStr::from_str(s);
             match opt_n {
                 Some(n) if n > 0 => n,
-                _ => fail!("RUST_TEST_TASKS is `%s`, should be a non-negative integer.", s)
+                _ => fail!("RUST_TEST_TASKS is `%s`, should be a positive integer.", s)
             }
         }
         None => {

branches/dist-snap/src/test/run-fail/test-threads-invalid-value.rs renamed to branches/dist-snap/src/test/run-fail/test-tasks-invalid-value.rs

@@ -11,7 +11,7 @@
 // This checks that RUST_TEST_TASKS not being 1, 2, ... is detected
 // properly.
 
-// error-pattern:should be a non-negative integer
+// error-pattern:should be a positive integer
 // compile-flags: --test
 // exec-env:RUST_TEST_TASKS=foo