---

yaml
---
r: 11765
b: refs/heads/master
c: 91e5a1c
h: refs/heads/master
i:
  11763: 1d3d052
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 035197609a7f5c604797e5fbbdc6e14c579a026f
+refs/heads/master: 91e5a1c8b3c56979b0d7025e83dc378f3d05b208
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/fuzzer/fuzzer.rs

@@ -254,9 +254,9 @@ fn check_variants_T<T: copy>(
     let L = vec::len(things);
 
     if L < 100u {
-        under(math::min(L, 20u)) {|i|
+        under(uint::min(L, 20u)) {|i|
             log(error, "Replacing... #" + uint::str(i));
-            under(math::min(L, 30u)) {|j|
+            under(uint::min(L, 30u)) {|j|
                 log(error, "With... " + stringifier(@things[j]));
                 let crate2 = @replacer(crate, i, things[j], cx.mode);
                 // It would be best to test the *crate* for stability, but testing the

trunk/src/libcore/core.rc

@@ -34,7 +34,7 @@ export either, option, result, iter;
 export libc, os, ctypes, sys, unsafe, logging;
 export comm, task, future;
 export extfmt;
-export math, bessel;
+export bessel;
 export tuple;
 export to_str;
 
@@ -84,7 +84,6 @@ mod os;
 mod path;
 
 mod ctypes;
-mod math;
 mod cmath;
 mod sys;
 mod unsafe;

trunk/src/libcore/math.rs

@@ -912,7 +912,7 @@ mod u8 {
     pure fn cmp(&&a: [u8], &&b: [u8]) -> int unsafe {
         let a_len = len(a);
         let b_len = len(b);
-        let n = math::min(a_len, b_len) as ctypes::size_t;
+        let n = uint::min(a_len, b_len) as ctypes::size_t;
         let r = libc::memcmp(unsafe::to_ptr(a) as *libc::c_void,
                              unsafe::to_ptr(b) as *libc::c_void, n) as int;
 

trunk/src/libcore/vec.rs

@@ -1006,7 +1006,7 @@ mod node {
                      right   : right,
              char_len: char_len(left) + char_len(right),
                      byte_len: byte_len(left) + byte_len(right),
-             height: math::max(height(left), height(right)) + 1u
+             height: uint::max(height(left), height(right)) + 1u
                     })
     }
 

trunk/src/libstd/rope.rs

@@ -129,7 +129,7 @@ fn get_relative_to(abs1: fs::path, abs2: fs::path) -> fs::path {
     assert len1 > 0u;
     assert len2 > 0u;
 
-    let max_common_path = math::min(len1, len2) - 1u;
+    let max_common_path = uint::min(len1, len2) - 1u;
     let start_idx = 0u;
     while start_idx < max_common_path
         && split1[start_idx] == split2[start_idx] {

trunk/src/rustc/back/rpath.rs

@@ -1568,7 +1568,7 @@ mod unify {
             _ { cx.tcx.sess.bug("someone forgot to document an invariant \
                          in union"); }
         };
-        ufind::grow(vb.sets, math::max(set_a, set_b) + 1u);
+        ufind::grow(vb.sets, uint::max(set_a, set_b) + 1u);
         let root_a = ufind::find(vb.sets, set_a);
         let root_b = ufind::find(vb.sets, set_b);
 

trunk/src/rustc/middle/ty.rs

@@ -1,4 +1,3 @@
-import math::{max, min};
 import std::map::hashmap;
 import syntax::ast;
 import ast::{ty, pat};

trunk/src/rustc/util/common.rs

@@ -57,7 +57,7 @@ fn unindent(s: str) -> str {
                     false
                 }
             };
-            math::min(min_indent, spaces)
+            uint::min(min_indent, spaces)
         }
     };