@@ -21,6 +21,7 @@ use std::mem::swap;
2121use std:: os;
2222use std:: str;
2323use std:: slice;
24+ use std:: vec;
2425use std:: io:: File ;
2526
2627macro_rules! bench (
@@ -61,8 +62,8 @@ fn maybe_run_test(argv: &[~str], name: ~str, test: ||) {
6162}
6263
6364fn shift_push ( ) {
64- let mut v1 = slice :: from_elem ( 30000 , 1 ) ;
65- let mut v2 = ~ [ ] ;
65+ let mut v1 = Vec :: from_elem ( 30000 , 1 ) ;
66+ let mut v2 = Vec :: new ( ) ;
6667
6768 while v1. len ( ) > 0 {
6869 v2. push ( v1. shift ( ) . unwrap ( ) ) ;
@@ -85,7 +86,7 @@ fn read_line() {
8586fn vec_plus ( ) {
8687 let mut r = rand:: task_rng ( ) ;
8788
88- let mut v = ~ [ ] ;
89+ let mut v = Vec :: new ( ) ;
8990 let mut i = 0 ;
9091 while i < 1500 {
9192 let rv = slice:: from_elem ( r. gen_range ( 0 u, i + 1 ) , i) ;
@@ -101,15 +102,15 @@ fn vec_plus() {
101102fn vec_append ( ) {
102103 let mut r = rand:: task_rng ( ) ;
103104
104- let mut v = ~ [ ] ;
105+ let mut v = Vec :: new ( ) ;
105106 let mut i = 0 ;
106107 while i < 1500 {
107108 let rv = slice:: from_elem ( r. gen_range ( 0 u, i + 1 ) , i) ;
108109 if r. gen ( ) {
109- v = slice :: append ( v, rv) ;
110+ v = vec :: append ( v, rv) ;
110111 }
111112 else {
112- v = slice :: append ( rv, v) ;
113+ v = vec :: append ( rv, v) ;
113114 }
114115 i += 1 ;
115116 }
@@ -118,7 +119,7 @@ fn vec_append() {
118119fn vec_push_all ( ) {
119120 let mut r = rand:: task_rng ( ) ;
120121
121- let mut v = ~ [ ] ;
122+ let mut v = Vec :: new ( ) ;
122123 for i in range ( 0 u, 1500 ) {
123124 let mut rv = slice:: from_elem ( r. gen_range ( 0 u, i + 1 ) , i) ;
124125 if r. gen ( ) {
@@ -132,7 +133,7 @@ fn vec_push_all() {
132133}
133134
134135fn is_utf8_ascii ( ) {
135- let mut v : ~ [ u8 ] = ~ [ ] ;
136+ let mut v : Vec < u8 > = Vec :: new ( ) ;
136137 for _ in range ( 0 u, 20000 ) {
137138 v. push ( 'b' as u8 ) ;
138139 if !str:: is_utf8 ( v) {
@@ -143,7 +144,7 @@ fn is_utf8_ascii() {
143144
144145fn is_utf8_multibyte ( ) {
145146 let s = "b¢€𤭢" ;
146- let mut v : ~ [ u8 ] = ~ [ ] ;
147+ let mut v : Vec < u8 > = Vec :: new ( ) ;
147148 for _ in range ( 0 u, 5000 ) {
148149 v. push_all ( s. as_bytes ( ) ) ;
149150 if !str:: is_utf8 ( v) {
0 commit comments