core: Demode int/uint mods

4 files changed, 6 insertions, 6 deletions

diff --git a/src/libstd/arena.rs b/src/libstd/arena.rs
index 7609fa70454..162e5f2c071 100644
--- a/src/libstd/arena.rs
+++ b/src/libstd/arena.rs
@@ -135,7 +135,7 @@ impl &Arena {
     fn alloc_pod_grow(n_bytes: uint, align: uint) -> *u8 {
         // Allocate a new chunk.
         let chunk_size = at_vec::capacity(self.pod_head.data);
-        let new_min_chunk_size = uint::max(n_bytes, chunk_size);
+        let new_min_chunk_size = uint::max(&n_bytes, &chunk_size);
         self.chunks = @cons(copy self.pod_head, self.chunks);
         self.pod_head =
             chunk(uint::next_power_of_two(new_min_chunk_size + 1u), true);
@@ -177,7 +177,7 @@ impl &Arena {
     fn alloc_nonpod_grow(n_bytes: uint, align: uint) -> (*u8, *u8) {
         // Allocate a new chunk.
         let chunk_size = at_vec::capacity(self.head.data);
-        let new_min_chunk_size = uint::max(n_bytes, chunk_size);
+        let new_min_chunk_size = uint::max(&n_bytes, &chunk_size);
         self.chunks = @cons(copy self.head, self.chunks);
         self.head =
             chunk(uint::next_power_of_two(new_min_chunk_size + 1u), false);
diff --git a/src/libstd/net_tcp.rs b/src/libstd/net_tcp.rs
index cb0fddcfe61..1cc5fa680d2 100644
--- a/src/libstd/net_tcp.rs
+++ b/src/libstd/net_tcp.rs
@@ -772,7 +772,7 @@ impl tcp_socket_buf: io::Reader {
             }
         }
 
-        let count = uint::min(len, self.data.buf.len());
+        let count = uint::min(&len, &self.data.buf.len());
 
         let mut data = ~[];
         self.data.buf <-> data;
diff --git a/src/libstd/par.rs b/src/libstd/par.rs
index 34ea2433bed..ab5062148e0 100644
--- a/src/libstd/par.rs
+++ b/src/libstd/par.rs
@@ -30,7 +30,7 @@ fn map_slices<A: copy send, B: copy send>(
         ~[f()(0u, xs)]
     }
     else {
-        let num_tasks = uint::min(max_tasks, len / min_granularity);
+        let num_tasks = uint::min(&max_tasks, &(len / min_granularity));
 
         let items_per_task = len / num_tasks;
 
@@ -38,7 +38,7 @@ fn map_slices<A: copy send, B: copy send>(
         let mut base = 0u;
         log(info, ~"spawning tasks");
         while base < len {
-            let end = uint::min(len, base + items_per_task);
+            let end = uint::min(&len, &(base + items_per_task));
             // FIXME: why is the ::<A, ()> annotation required here? (#2617)
             do vec::as_buf::<A, ()>(xs) |p, _len| {
                 let f = f();
diff --git a/src/libstd/rope.rs b/src/libstd/rope.rs
index 2a7cdeefc7d..32a97bac508 100644
--- a/src/libstd/rope.rs
+++ b/src/libstd/rope.rs
@@ -1002,7 +1002,7 @@ mod node {
                      right   : right,
              char_len: char_len(left) + char_len(right),
                      byte_len: byte_len(left) + byte_len(right),
-             height: uint::max(height(left), height(right)) + 1u
+             height: uint::max(&height(left), &height(right)) + 1u
                     })
     }