From c976b7c623e242ab2400d3c641cb082c814690fe Mon Sep 17 00:00:00 2001
From: Marijn Haverbeke <marijnh@gmail.com>
Date: Fri, 3 Feb 2012 14:18:14 +0100
Subject: [PATCH] Fix tests for str::le patch

---
 src/test/compile-fail/no-constraint-prop.rs    | 9 +++------
 src/test/run-fail/fn-constraint.rs             | 7 ++-----
 src/test/run-pass/constraint-prop-expr-move.rs | 5 +----
 src/test/run-pass/constraint-prop-move.rs      | 6 +-----
 src/test/run-pass/constraint-prop-swap.rs      | 6 +-----
 src/test/run-pass/constraint-prop.rs           | 6 +-----
 src/test/run-pass/fn-constraint.rs             | 6 +-----
 7 files changed, 10 insertions(+), 35 deletions(-)

diff --git a/src/test/compile-fail/no-constraint-prop.rs b/src/test/compile-fail/no-constraint-prop.rs
index ae5a024863b7..75e4d67028f3 100644
--- a/src/test/compile-fail/no-constraint-prop.rs
+++ b/src/test/compile-fail/no-constraint-prop.rs
@@ -1,17 +1,14 @@
-// error-pattern:Unsatisfied precondition constraint (for example, le(b, d
-use std;
-import str::*;
-import uint::*;
+// error-pattern:Unsatisfied precondition constraint (for example, uint::le
 
 fn main() unsafe {
     let a: uint = 1u;
     let b: uint = 4u;
     let c: uint = 5u;
     // make sure that the constraint le(b, a) exists...
-    check (le(b, a));
+    check (uint::le(b, a));
     // ...invalidate it...
     b += 1u;
-    check (le(c, a));
+    check (uint::le(c, a));
     // ...and check that it doesn't get set in the poststate of
     // the next statement, since it's not true in the
     // prestate.
diff --git a/src/test/run-fail/fn-constraint.rs b/src/test/run-fail/fn-constraint.rs
index 5277b1bc6e13..2c7934fdffca 100644
--- a/src/test/run-fail/fn-constraint.rs
+++ b/src/test/run-fail/fn-constraint.rs
@@ -1,11 +1,8 @@
-// error-pattern:Predicate le(a, b) failed
-use std;
-import str::*;
-import uint::le;
+// error-pattern:Predicate uint::le(a, b) failed
 
 fn main() unsafe {
     let a: uint = 4u;
     let b: uint = 1u;
-    check (le(a, b));
+    check (uint::le(a, b));
     log(error, str::unsafe::slice_bytes_safe_range("kitties", a, b));
 }
diff --git a/src/test/run-pass/constraint-prop-expr-move.rs b/src/test/run-pass/constraint-prop-expr-move.rs
index 1f8e6f69b273..e4a2badb9ec8 100644
--- a/src/test/run-pass/constraint-prop-expr-move.rs
+++ b/src/test/run-pass/constraint-prop-expr-move.rs
@@ -1,12 +1,9 @@
-use std;
-import str::*;
-import uint::*;
 
 fn main() unsafe {
     let a: uint = 1u;
     let b: uint = 4u;
     let c: uint = 17u;
-    check (le(a, b));
+    check (uint::le(a, b));
     c <- a;
     log(debug, str::unsafe::slice_bytes_safe_range("kitties", c, b));
 }
diff --git a/src/test/run-pass/constraint-prop-move.rs b/src/test/run-pass/constraint-prop-move.rs
index 12124e8801f2..a12ba6b04d58 100644
--- a/src/test/run-pass/constraint-prop-move.rs
+++ b/src/test/run-pass/constraint-prop-move.rs
@@ -1,11 +1,7 @@
-use std;
-import str::*;
-import uint::*;
-
 fn main() unsafe {
     let a: uint = 1u;
     let b: uint = 4u;
-    check (le(a, b));
+    check (uint::le(a, b));
     let c <- a;
     log(debug, str::unsafe::slice_bytes_safe_range("kitties", c, b));
 }
diff --git a/src/test/run-pass/constraint-prop-swap.rs b/src/test/run-pass/constraint-prop-swap.rs
index 6c9af246dbda..a20702954872 100644
--- a/src/test/run-pass/constraint-prop-swap.rs
+++ b/src/test/run-pass/constraint-prop-swap.rs
@@ -1,11 +1,7 @@
-use std;
-import str::*;
-import uint::*;
-
 fn main() unsafe {
     let a: uint = 4u;
     let b: uint = 1u;
-    check (le(b, a));
+    check (uint::le(b, a));
     b <-> a;
     log(debug, str::unsafe::slice_bytes_safe_range("kitties", a, b));
 }
diff --git a/src/test/run-pass/constraint-prop.rs b/src/test/run-pass/constraint-prop.rs
index 62cee45c9581..2bbff1342d28 100644
--- a/src/test/run-pass/constraint-prop.rs
+++ b/src/test/run-pass/constraint-prop.rs
@@ -1,11 +1,7 @@
-use std;
-import str::*;
-import uint::*;
-
 fn main() unsafe {
     let a: uint = 1u;
     let b: uint = 4u;
-    check (le(a, b));
+    check (uint::le(a, b));
     let c = b;
     log(debug, str::unsafe::slice_bytes_safe_range("kitties", a, c));
 }
diff --git a/src/test/run-pass/fn-constraint.rs b/src/test/run-pass/fn-constraint.rs
index 2d5e28f209ca..20cca31e2a19 100644
--- a/src/test/run-pass/fn-constraint.rs
+++ b/src/test/run-pass/fn-constraint.rs
@@ -1,10 +1,6 @@
-use std;
-import str::*;
-import uint::*;
-
 fn main() unsafe {
     let a: uint = 1u;
     let b: uint = 4u;
-    check (le(a, b));
+    check (uint::le(a, b));
     log(debug, str::unsafe::slice_bytes_safe_range("kitties", a, b));
 }