auto merge of #2238 : mozilla/servo/rustup_20140410c, r=Ms2ger

r? @metajack 

Note that all pending submodule PRs must be landed before this should be given r+.

1 files changed, 4 insertions, 4 deletions

diff --git a/src/components/util/vec.rs b/src/components/util/vec.rs
index aad8da7d04e..9a1f520c58e 100644
--- a/src/components/util/vec.rs
+++ b/src/components/util/vec.rs
@@ -24,15 +24,15 @@ impl<'a, T: Ord + Eq> BinarySearchMethods<'a, T> for &'a [T] {
 
         while low <= high {
             // http://googleresearch.blogspot.com/2006/06/extra-extra-read-all-about-it-nearly.html
-            let mid : int = (((low as uint) + (high as uint)) >> 1) as int;
+            let mid = ((low as uint) + (high as uint)) >> 1;
             let midv = &self[mid];
 
             if midv < key {
-                low = mid + 1;
+                low = (mid as int) + 1;
             } else if midv > key {
-                high = mid - 1;
+                high = (mid as int) - 1;
             } else {
-                return Some(mid as uint);
+                return Some(mid);
             }
         }
         return None;