diff options
| author | Matt Brubeck <mbrubeck@limpet.net> | 2011-10-27 13:04:06 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2011-10-27 13:37:53 -0700 |
| commit | 5d6fe1a533db9ec7fc5c640697b289389dc62221 (patch) | |
| tree | bfd7ddf39205770444a80cc7e8625e7e79871449 /src/comp | |
| parent | 50d99ec32ce197fb3c355d7cd88ace82e538790e (diff) | |
| download | rust-5d6fe1a533db9ec7fc5c640697b289389dc62221.tar.gz rust-5d6fe1a533db9ec7fc5c640697b289389dc62221.zip | |
Remove uint::max/min in favor if math::max/min
Diffstat (limited to 'src/comp')
| -rw-r--r-- | src/comp/back/rpath.rs | 3 | ||||
| -rw-r--r-- | src/comp/middle/ty.rs | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/comp/back/rpath.rs b/src/comp/back/rpath.rs index 2098e734397..048459dfcbf 100644 --- a/src/comp/back/rpath.rs +++ b/src/comp/back/rpath.rs @@ -3,6 +3,7 @@ import std::fs; import std::os_fs; import std::vec; import std::map; +import std::math; import std::str; import std::uint; import metadata::cstore; @@ -128,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 = uint::min(len1, len2) - 1u; + let max_common_path = math::min(len1, len2) - 1u; let start_idx = 0u; while start_idx < max_common_path && split1[start_idx] == split2[start_idx] { diff --git a/src/comp/middle/ty.rs b/src/comp/middle/ty.rs index 305d05a5b5d..026630c8706 100644 --- a/src/comp/middle/ty.rs +++ b/src/comp/middle/ty.rs @@ -6,6 +6,7 @@ import std::box; import std::ufind; import std::map; import std::map::hashmap; +import std::math; import std::option; import std::option::none; import std::option::some; @@ -1812,7 +1813,7 @@ mod unify { // Unifies two sets. fn union(cx: @ctxt, set_a: uint, set_b: uint, variance: variance) -> union_result { - ufind::grow(cx.vb.sets, uint::max(set_a, set_b) + 1u); + ufind::grow(cx.vb.sets, math::max(set_a, set_b) + 1u); let root_a = ufind::find(cx.vb.sets, set_a); let root_b = ufind::find(cx.vb.sets, set_b); |
