auto merge of #10568 : pcwalton/rust/more-bars, r=alexcrichton

r? @alexcrichton

5 files changed, 17 insertions, 7 deletions

diff --git a/src/libstd/num/int_macros.rs b/src/libstd/num/int_macros.rs
index ba1a7a4f912..9141e87bd72 100644
--- a/src/libstd/num/int_macros.rs
+++ b/src/libstd/num/int_macros.rs
@@ -415,7 +415,7 @@ impl FromStrRadix for $T {
 
 /// Convert to a string as a byte slice in a given base.
 #[inline]
-pub fn to_str_bytes<U>(n: $T, radix: uint, f: &fn(v: &[u8]) -> U) -> U {
+pub fn to_str_bytes<U>(n: $T, radix: uint, f: |v: &[u8]| -> U) -> U {
     // The radix can be as low as 2, so we need at least 64 characters for a
     // base 2 number, and then we need another for a possible '-' character.
     let mut buf = [0u8, ..65];
diff --git a/src/libstd/num/mod.rs b/src/libstd/num/mod.rs
index 873d66d401e..aeda3fa1cd1 100644
--- a/src/libstd/num/mod.rs
+++ b/src/libstd/num/mod.rs
@@ -108,7 +108,7 @@ pub trait Unsigned: Num {}
 /// ```
 ///
 pub trait Times {
-    fn times(&self, it: &fn());
+    fn times(&self, it: ||);
 }
 
 pub trait Integer: Num
diff --git a/src/libstd/num/strconv.rs b/src/libstd/num/strconv.rs
index d17c947ab56..5d713f1a622 100644
--- a/src/libstd/num/strconv.rs
+++ b/src/libstd/num/strconv.rs
@@ -132,9 +132,19 @@ static NAN_BUF:          [u8, ..3] = ['N' as u8, 'a' as u8, 'N' as u8];
  * # Failure
  * - Fails if `radix` < 2 or `radix` > 36.
  */
-pub fn int_to_str_bytes_common<T:NumCast+Zero+Eq+Ord+Integer+
-                                 Div<T,T>+Neg<T>+Rem<T,T>+Mul<T,T>>(
-        num: T, radix: uint, sign: SignFormat, f: &fn(u8)) {
+pub fn int_to_str_bytes_common<T:NumCast
+                                +Zero
+                                +Eq
+                                +Ord
+                                +Integer
+                                +Div<T,T>
+                                +Neg<T>
+                                +Rem<T,T>
+                                +Mul<T,T>>(
+                                num: T,
+                                radix: uint,
+                                sign: SignFormat,
+                                f: |u8|) {
     assert!(2 <= radix && radix <= 36);
 
     let _0: T = Zero::zero();
diff --git a/src/libstd/num/uint.rs b/src/libstd/num/uint.rs
index 2ecbb79407e..1cc0c191501 100644
--- a/src/libstd/num/uint.rs
+++ b/src/libstd/num/uint.rs
@@ -85,7 +85,7 @@ impl num::Times for uint {
     /// use with integer literals of inferred integer-type as
     /// the self-value (eg. `do 100.times { ... }`).
     ///
-    fn times(&self, it: &fn()) {
+    fn times(&self, it: ||) {
         let mut i = *self;
         while i > 0 {
             it();
diff --git a/src/libstd/num/uint_macros.rs b/src/libstd/num/uint_macros.rs
index 2974b402d4a..49f270369f7 100644
--- a/src/libstd/num/uint_macros.rs
+++ b/src/libstd/num/uint_macros.rs
@@ -266,7 +266,7 @@ impl FromStrRadix for $T {
 
 /// Convert to a string as a byte slice in a given base.
 #[inline]
-pub fn to_str_bytes<U>(n: $T, radix: uint, f: &fn(v: &[u8]) -> U) -> U {
+pub fn to_str_bytes<U>(n: $T, radix: uint, f: |v: &[u8]| -> U) -> U {
     // The radix can be as low as 2, so we need at least 64 characters for a
     // base 2 number.
     let mut buf = [0u8, ..64];