From bf2a225c0b6f90f61bcaf4a6f33d9eaf424795b6 Mon Sep 17 00:00:00 2001
From: Patrick Walton <pcwalton@mimiga.net>
Date: Wed, 20 Feb 2013 17:07:17 -0800
Subject: librustc: Separate most trait bounds with '+'. rs=plussing

---
 src/libfuzzer/cycles.rs    |  2 +-
 src/libfuzzer/ivec_fuzz.rs | 16 ++++++++--------
 src/libfuzzer/rand_util.rs |  8 ++++----
 3 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'src/libfuzzer')

diff --git a/src/libfuzzer/cycles.rs b/src/libfuzzer/cycles.rs
index a64700494c8..7288b6d261d 100644
--- a/src/libfuzzer/cycles.rs
+++ b/src/libfuzzer/cycles.rs
@@ -18,7 +18,7 @@ fn under(r : rand::rng, n : uint) -> uint {
 }
 
 // random choice from a vec
-fn choice<T: copy>(r : rand::rng, v : ~[const T]) -> T {
+fn choice<T:copy>(r : rand::rng, v : ~[const T]) -> T {
     assert vec::len(v) != 0u; v[under(r, vec::len(v))]
 }
 
diff --git a/src/libfuzzer/ivec_fuzz.rs b/src/libfuzzer/ivec_fuzz.rs
index eadc706fe13..25dc14c3d78 100644
--- a/src/libfuzzer/ivec_fuzz.rs
+++ b/src/libfuzzer/ivec_fuzz.rs
@@ -32,22 +32,22 @@ extern mod std;
 use vec::slice;
 use vec::len;
 
-fn vec_omit<T: copy>(v: ~[T], i: uint) -> ~[T] {
+fn vec_omit<T:copy>(v: ~[T], i: uint) -> ~[T] {
     slice(v, 0u, i) + slice(v, i + 1u, len(v))
 }
-fn vec_dup<T: copy>(v: ~[T], i: uint) -> ~[T] {
+fn vec_dup<T:copy>(v: ~[T], i: uint) -> ~[T] {
     slice(v, 0u, i) + [v[i]] + slice(v, i, len(v))
 }
-fn vec_swadj<T: copy>(v: ~[T], i: uint) -> ~[T] {
+fn vec_swadj<T:copy>(v: ~[T], i: uint) -> ~[T] {
     slice(v, 0u, i) + [v[i + 1u], v[i]] + slice(v, i + 2u, len(v))
 }
-fn vec_prefix<T: copy>(v: ~[T], i: uint) -> ~[T] { slice(v, 0u, i) }
-fn vec_suffix<T: copy>(v: ~[T], i: uint) -> ~[T] { slice(v, i, len(v)) }
+fn vec_prefix<T:copy>(v: ~[T], i: uint) -> ~[T] { slice(v, 0u, i) }
+fn vec_suffix<T:copy>(v: ~[T], i: uint) -> ~[T] { slice(v, i, len(v)) }
 
-fn vec_poke<T: copy>(v: ~[T], i: uint, x: T) -> ~[T] {
+fn vec_poke<T:copy>(v: ~[T], i: uint, x: T) -> ~[T] {
     slice(v, 0u, i) + ~[x] + slice(v, i + 1u, len(v))
 }
-fn vec_insert<T: copy>(v: ~[T], i: uint, x: T) -> ~[T] {
+fn vec_insert<T:copy>(v: ~[T], i: uint, x: T) -> ~[T] {
     slice(v, 0u, i) + ~[x] + slice(v, i, len(v))
 }
 
@@ -59,7 +59,7 @@ fn ix(skip_low: uint, skip_high: uint, length: uint, it: block(uint)) {
 
 // Returns a bunch of modified versions of v, some of which introduce
 // new elements (borrowed from xs).
-fn vec_edits<T: copy>(v: ~[T], xs: ~[T]) -> ~[~[T]] {
+fn vec_edits<T:copy>(v: ~[T], xs: ~[T]) -> ~[~[T]] {
     let edits: ~[~[T]] = ~[];
     let Lv: uint = len(v);
 
diff --git a/src/libfuzzer/rand_util.rs b/src/libfuzzer/rand_util.rs
index cb074eecd6d..507d0666da0 100644
--- a/src/libfuzzer/rand_util.rs
+++ b/src/libfuzzer/rand_util.rs
@@ -17,7 +17,7 @@ fn under(r : rand::rng, n : uint) -> uint {
 }
 
 // random choice from a vec
-fn choice<T: copy>(r : rand::rng, v : ~[T]) -> T {
+fn choice<T:copy>(r : rand::rng, v : ~[T]) -> T {
     assert vec::len(v) != 0u; v[under(r, vec::len(v))]
 }
 
@@ -35,7 +35,7 @@ fn shuffle<T>(r : rand::rng, &v : ~[T]) {
 }
 
 // create a shuffled copy of a vec
-fn shuffled<T: copy>(r : rand::rng, v : ~[T]) -> ~[T] {
+fn shuffled<T:copy>(r : rand::rng, v : ~[T]) -> ~[T] {
     let w = vec::to_mut(v);
     shuffle(r, w);
     vec::from_mut(w) // Shouldn't this happen automatically?
@@ -48,7 +48,7 @@ fn shuffled<T: copy>(r : rand::rng, v : ~[T]) -> ~[T] {
 // * weighted_choice is O(number of choices) time
 // * weighted_vec is O(total weight) space
 type weighted<T> = { weight: uint, item: T };
-fn weighted_choice<T: copy>(r : rand::rng, v : ~[weighted<T>]) -> T {
+fn weighted_choice<T:copy>(r : rand::rng, v : ~[weighted<T>]) -> T {
     assert vec::len(v) != 0u;
     let total = 0u;
     for {weight: weight, item: _} in v {
@@ -66,7 +66,7 @@ fn weighted_choice<T: copy>(r : rand::rng, v : ~[weighted<T>]) -> T {
     core::unreachable();
 }
 
-fn weighted_vec<T: copy>(v : ~[weighted<T>]) -> ~[T] {
+fn weighted_vec<T:copy>(v : ~[weighted<T>]) -> ~[T] {
     let r = ~[];
     for {weight: weight, item: item} in v {
         let i = 0u;
-- 
cgit 1.4.1-3-g733a5