From c0c8d3aa8fdd054372f91c997913b33146bdf9bd Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Wed, 29 Aug 2012 16:11:06 -0700 Subject: core: Demode int/uint mods --- src/rustc/back/rpath.rs | 2 +- src/rustc/driver/rustc.rs | 2 +- src/rustc/middle/trans/foreign.rs | 2 +- src/rustc/middle/ty.rs | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/rustc') diff --git a/src/rustc/back/rpath.rs b/src/rustc/back/rpath.rs index fa02b617606..286ca505714 100644 --- a/src/rustc/back/rpath.rs +++ b/src/rustc/back/rpath.rs @@ -128,7 +128,7 @@ fn get_relative_to(abs1: &Path, abs2: &Path) -> Path { assert len1 > 0u; assert len2 > 0u; - let max_common_path = uint::min(len1, len2) - 1u; + let max_common_path = uint::min(&len1, &len2) - 1u; let mut start_idx = 0u; while start_idx < max_common_path && split1[start_idx] == split2[start_idx] { diff --git a/src/rustc/driver/rustc.rs b/src/rustc/driver/rustc.rs index 927b6b3da2b..7e56a8caedd 100644 --- a/src/rustc/driver/rustc.rs +++ b/src/rustc/driver/rustc.rs @@ -81,7 +81,7 @@ Options: fn describe_warnings() { let lint_dict = lint::get_lint_dict(); let mut max_key = 0u; - for lint_dict.each_key |k| { max_key = uint::max(k.len(), max_key); } + for lint_dict.each_key |k| { max_key = uint::max(&k.len(), &max_key); } fn padded(max: uint, s: ~str) -> ~str { str::from_bytes(vec::from_elem(max - s.len(), ' ' as u8)) + s } diff --git a/src/rustc/middle/trans/foreign.rs b/src/rustc/middle/trans/foreign.rs index d760e47296e..2c410b886d7 100644 --- a/src/rustc/middle/trans/foreign.rs +++ b/src/rustc/middle/trans/foreign.rs @@ -82,7 +82,7 @@ fn classify_ty(ty: TypeRef) -> ~[x86_64_reg_class] { 3 /* double */ => 8u, 10 /* struct */ => { do vec::foldl(0u, struct_tys(ty)) |a, t| { - uint::max(a, ty_align(t)) + uint::max(&a, &ty_align(t)) } } 11 /* array */ => { diff --git a/src/rustc/middle/ty.rs b/src/rustc/middle/ty.rs index 18d54dbf5d8..5e8b2644363 100644 --- a/src/rustc/middle/ty.rs +++ b/src/rustc/middle/ty.rs @@ -1856,9 +1856,9 @@ fn type_size(cx: ctxt, ty: t) -> uint { let variants = substd_enum_variants(cx, did, substs); variants.foldl( // find max size of any variant 0, - |m, v| uint::max(m, + |m, v| uint::max(&m, // find size of this variant: - v.args.foldl(0, |s, a| s + type_size(cx, a)))) + &v.args.foldl(0, |s, a| s + type_size(cx, a)))) } ty_param(_) | ty_self => { -- cgit 1.4.1-3-g733a5