---

yaml
---
r: 6872
b: refs/heads/master
c: 8bde865
h: refs/heads/master
v: v3

Author: graydon

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bc95ccb53694a8ad992ea5bf58e41a22c4e7b7d6
+refs/heads/master: 8bde865d0939658d134cc094dee168065153fdfa

trunk/src/comp/back/rpath.rs

@@ -3,7 +3,6 @@ import std::fs;
 import std::os_fs;
 import vec;
 import std::map;
-import std::math;
 import str;
 import uint;
 import metadata::cstore;
@@ -129,7 +128,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 = float::min(len1, len2) - 1u;
     let start_idx = 0u;
     while start_idx < max_common_path
         && split1[start_idx] == split2[start_idx] {

trunk/src/comp/middle/ty.rs

@@ -4,7 +4,6 @@ import uint;
 import std::ufind;
 import std::map;
 import std::map::hashmap;
-import std::math;
 import option;
 import option::none;
 import option::some;
@@ -1159,7 +1158,8 @@ fn type_is_signed(cx: ctxt, ty: t) -> bool {
     }
 }
 
-// Whether a type is Plain Old Data (i.e. can be safely memmoved).
+// Whether a type is Plain Old Data -- meaning it does not contain pointers
+// that the cycle collector might care about.
 fn type_is_pod(cx: ctxt, ty: t) -> bool {
     let result = true;
     alt struct(cx, ty) {
@@ -1754,7 +1754,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, math::max(set_a, set_b) + 1u);
+        ufind::grow(cx.vb.sets, float::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);
 

trunk/src/comp/util/common.rs

@@ -1,5 +1,5 @@
 import core::{str, option};
-import std::math::{max, min};
+import core::float::{max, min};
 import std::map::hashmap;
 import option::{some};
 import syntax::ast;

trunk/src/fuzzer/fuzzer.rs

@@ -1,5 +1,5 @@
 import core::{vec, str, int, uint, option, result};
-import std::{fs, io, math};
+import std::{fs, io};
 
 import rustc::syntax::{ast, ast_util, fold, visit, codemap};
 import rustc::syntax::parse::parser;
@@ -241,9 +241,9 @@ fn check_variants_T<copy T>(
     let L = vec::len(things);
 
     if L < 100u {
-        under(math::min(L, 20u)) {|i|
+        under(float::min(L, 20u)) {|i|
             log_err "Replacing... #" + uint::str(i);
-            under(math::min(L, 30u)) {|j|
+            under(float::min(L, 30u)) {|j|
                 log_err "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