---

yaml
---
r: 46203
b: refs/heads/auto
c: d67e144
h: refs/heads/master
i:
  46201: 005d132
  46199: d1776a1
v: v3

Author: luqmana

[refs]

@@ -14,4 +14,4 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 7393fde763484ec504399667c1808dc8c5a3559f
+refs/heads/auto: d67e144f685783503c1406cb4f28ea19d91d1fec

branches/auto/src/compiletest/compiletest.rc

@@ -33,7 +33,7 @@ mod errors;
 use std::getopts;
 use std::test;
 
-use core::{result, either};
+use core::result;
 use result::{Ok, Err};
 
 use common::config;
@@ -158,11 +158,7 @@ pub fn test_opts(config: config) -> test::TestOpts {
     test::TestOpts {
         filter: config.filter,
         run_ignored: config.run_ignored,
-        logfile: copy config.logfile,
-        run_tests: true,
-        run_benchmarks: false,
-        save_results: option::None,
-        compare_results: option::None
+        logfile: config.logfile.map(|s| s.to_str()),
     }
 }
 
@@ -214,15 +210,13 @@ pub fn make_test(config: config, testfile: &Path) -> test::TestDescAndFn {
     }
 }
 
-pub fn make_test_name(config: config, testfile: &Path) -> test::TestName {
-    test::DynTestName(fmt!("[%s] %s",
-                           mode_str(config.mode),
-                           testfile.to_str()))
+pub fn make_test_name(config: config, testfile: &Path) -> ~str {
+    fmt!("[%s] %s", mode_str(config.mode), testfile.to_str())
 }
 
 pub fn make_test_closure(config: config, testfile: &Path) -> test::TestFn {
     let testfile = testfile.to_str();
-    test::DynTestFn(fn~() { runtest::run(config, testfile) })
+    fn~() { runtest::run(config, testfile) }
 }
 
 // Local Variables:

branches/auto/src/libcore/cmp.rs

@@ -85,12 +85,3 @@ pub pure fn gt<T: Ord>(v1: &T, v2: &T) -> bool {
     (*v1).gt(v2)
 }
 
-#[inline(always)]
-pub pure fn min<T: Ord>(v1: T, v2: T) -> T {
-    if v1 < v2 { v1 } else { v2 }
-}
-
-#[inline(always)]
-pub pure fn max<T: Ord>(v1: T, v2: T) -> T {
-    if v1 > v2 { v1 } else { v2 }
-}

branches/auto/src/libcore/either.rs

@@ -145,7 +145,7 @@ pub pure fn unwrap_right<T,U>(eith: Either<T,U>) -> U {
     }
 }
 
-pub impl<T, U> Either<T, U> {
+impl<T, U> Either<T, U> {
     #[inline(always)]
     fn either<V>(&self, f_left: fn(&T) -> V, f_right: fn(&U) -> V) -> V {
         either(f_left, f_right, self)

branches/auto/src/libcore/num/f64.rs

@@ -21,7 +21,6 @@ use to_str;
 use from_str;
 
 pub use cmath::c_double_targ_consts::*;
-pub use cmp::{min, max};
 
 macro_rules! delegate(
     (

branches/auto/src/libcore/num/int-template.rs

@@ -24,14 +24,18 @@ use vec;
 use i8;
 use i16;
 use i32;
-pub use cmp::{min, max};
 
 pub const bits : uint = inst::bits;
 pub const bytes : uint = (inst::bits / 8);
 
 pub const min_value: T = (-1 as T) << (bits - 1);
 pub const max_value: T = min_value - 1 as T;
 
+#[inline(always)]
+pub pure fn min(x: T, y: T) -> T { if x < y { x } else { y } }
+#[inline(always)]
+pub pure fn max(x: T, y: T) -> T { if x > y { x } else { y } }
+
 #[inline(always)]
 pub pure fn add(x: T, y: T) -> T { x + y }
 #[inline(always)]

branches/auto/src/libcore/num/num.rs

@@ -39,10 +39,6 @@ pub trait One {
     static pure fn one() -> Self;
 }
 
-pub pure fn abs<T: Ord Num Zero>(v: T) -> T {
-    if v < Zero::zero() { v.neg() } else { v }
-}
-
 pub trait Round {
     pure fn round(&self, mode: RoundMode) -> Self;
 

branches/auto/src/libcore/num/uint-template.rs

@@ -27,14 +27,17 @@ use u8;
 use u16;
 use u32;
 
-pub use cmp::{min, max};
-
 pub const bits : uint = inst::bits;
 pub const bytes : uint = (inst::bits / 8);
 
 pub const min_value: T = 0 as T;
 pub const max_value: T = 0 as T - 1 as T;
 
+#[inline(always)]
+pub pure fn min(x: T, y: T) -> T { if x < y { x } else { y } }
+#[inline(always)]
+pub pure fn max(x: T, y: T) -> T { if x > y { x } else { y } }
+
 #[inline(always)]
 pub pure fn add(x: T, y: T) -> T { x + y }
 #[inline(always)]