---

yaml
---
r: 7043
b: refs/heads/master
c: 1f71a0f
h: refs/heads/master
i:
  7041: 69e84cd
  7039: a565bce
v: v3

Author: marijnh

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1f10ee365c840cb5d54fe4eb32659f09d29ace38
+refs/heads/master: 1f71a0f48d18d80ff3be6970d582c5a67f976329

trunk/src/comp/back/rpath.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 = 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/trans.rs

@@ -5354,7 +5354,7 @@ fn collect_item(ccx: @crate_ctxt, abi: @mutable option::t<ast::native_abi>,
         register_fn(ccx, i.span, new_pt, "obj_ctor", tps, ctor_id);
       }
       ast::item_impl(tps, _, _, methods) {
-        let name = ccx.names.next(i.ident);
+        let name = i.ident + int::str(i.id);
         for m in methods {
             register_fn(ccx, i.span, pt + [name, m.ident],
                         "impl_method", tps + m.tps, m.id);
@@ -5418,9 +5418,7 @@ fn trans_constant(ccx: @crate_ctxt, it: @ast::item, &&pt: [str],
       ast::item_impl(tps, some(@{node: ast::ty_path(_, id), _}), _, ms) {
         let i_did = ast_util::def_id_of_def(ccx.tcx.def_map.get(id));
         let ty = ty::lookup_item_type(ccx.tcx, i_did).ty;
-        // FIXME[impl] use the same name as used in collect_items, for
-        // slightly more consistent symbol names?
-        let new_pt = pt + [ccx.names.next(it.ident)];
+        let new_pt = pt + [it.ident + int::str(it.id), "wrap"];
         let extra_tps = vec::map(tps, {|p| param_bounds(ccx, p)});
         let tbl = C_struct(vec::map(*ty::iface_methods(ccx.tcx, i_did), {|im|
             alt vec::find(ms, {|m| m.ident == im.ident}) {

trunk/src/comp/middle/ty.rs

@@ -1765,7 +1765,7 @@ mod unify {
         let vb = alt cx.st {
             in_bindings(vb) { vb }
         };
-        ufind::grow(vb.sets, math::max(set_a, set_b) + 1u);
+        ufind::grow(vb.sets, float::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/comp/middle/typeck.rs

@@ -2920,8 +2920,6 @@ mod dict {
                             bind_params(fcx, self_ty, n_tps)
                         } else { {vars: [], ty: self_ty} };
                         let im_bs = ty::lookup_item_type(tcx, im.did).bounds;
-                        // FIXME[impl] don't do this in fcx (or make
-                        // unify transactional by scrubbing bindings on fail)
                         alt unify::unify(fcx, ty, self_ty) {
                           ures_ok(_) {
                             if option::is_some(found) {

trunk/src/comp/util/common.rs

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

trunk/src/etc/cmathconsts.c

@@ -1,3 +1,4 @@
+import core::{vec, str, int, uint, option, result};
 import std::{fs, io};
 
 import rustc::syntax::{ast, ast_util, fold, visit, codemap};
@@ -240,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(error, "Replacing... #" + uint::str(i));
-            under(math::min(L, 30u)) {|j|
+            under(float::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