@@ -213,7 +213,7 @@ fn bench_extend_1000_1000(b: &mut Bencher) {
213213 do_bench_extend ( b, 1000 , 1000 )
214214}
215215
216- fn do_bench_push_all ( b : & mut Bencher , dst_len : usize , src_len : usize ) {
216+ fn do_bench_extend_from_slice ( b : & mut Bencher , dst_len : usize , src_len : usize ) {
217217 let dst: Vec < _ > = FromIterator :: from_iter ( 0 ..dst_len) ;
218218 let src: Vec < _ > = FromIterator :: from_iter ( dst_len..dst_len + src_len) ;
219219
@@ -228,87 +228,38 @@ fn do_bench_push_all(b: &mut Bencher, dst_len: usize, src_len: usize) {
228228}
229229
230230#[ bench]
231- fn bench_push_all_0000_0000 ( b : & mut Bencher ) {
232- do_bench_push_all ( b, 0 , 0 )
231+ fn bench_extend_from_slice_0000_0000 ( b : & mut Bencher ) {
232+ do_bench_extend_from_slice ( b, 0 , 0 )
233233}
234234
235235#[ bench]
236- fn bench_push_all_0000_0010 ( b : & mut Bencher ) {
237- do_bench_push_all ( b, 0 , 10 )
236+ fn bench_extend_from_slice_0000_0010 ( b : & mut Bencher ) {
237+ do_bench_extend_from_slice ( b, 0 , 10 )
238238}
239239
240240#[ bench]
241- fn bench_push_all_0000_0100 ( b : & mut Bencher ) {
242- do_bench_push_all ( b, 0 , 100 )
241+ fn bench_extend_from_slice_0000_0100 ( b : & mut Bencher ) {
242+ do_bench_extend_from_slice ( b, 0 , 100 )
243243}
244244
245245#[ bench]
246- fn bench_push_all_0000_1000 ( b : & mut Bencher ) {
247- do_bench_push_all ( b, 0 , 1000 )
246+ fn bench_extend_from_slice_0000_1000 ( b : & mut Bencher ) {
247+ do_bench_extend_from_slice ( b, 0 , 1000 )
248248}
249249
250250#[ bench]
251- fn bench_push_all_0010_0010 ( b : & mut Bencher ) {
252- do_bench_push_all ( b, 10 , 10 )
251+ fn bench_extend_from_slice_0010_0010 ( b : & mut Bencher ) {
252+ do_bench_extend_from_slice ( b, 10 , 10 )
253253}
254254
255255#[ bench]
256- fn bench_push_all_0100_0100 ( b : & mut Bencher ) {
257- do_bench_push_all ( b, 100 , 100 )
256+ fn bench_extend_from_slice_0100_0100 ( b : & mut Bencher ) {
257+ do_bench_extend_from_slice ( b, 100 , 100 )
258258}
259259
260260#[ bench]
261- fn bench_push_all_1000_1000 ( b : & mut Bencher ) {
262- do_bench_push_all ( b, 1000 , 1000 )
263- }
264-
265- fn do_bench_push_all_move ( b : & mut Bencher , dst_len : usize , src_len : usize ) {
266- let dst: Vec < _ > = FromIterator :: from_iter ( 0 ..dst_len) ;
267- let src: Vec < _ > = FromIterator :: from_iter ( dst_len..dst_len + src_len) ;
268-
269- b. bytes = src_len as u64 ;
270-
271- b. iter ( || {
272- let mut dst = dst. clone ( ) ;
273- dst. extend ( src. clone ( ) ) ;
274- assert_eq ! ( dst. len( ) , dst_len + src_len) ;
275- assert ! ( dst. iter( ) . enumerate( ) . all( |( i, x) | i == * x) ) ;
276- } ) ;
277- }
278-
279- #[ bench]
280- fn bench_push_all_move_0000_0000 ( b : & mut Bencher ) {
281- do_bench_push_all_move ( b, 0 , 0 )
282- }
283-
284- #[ bench]
285- fn bench_push_all_move_0000_0010 ( b : & mut Bencher ) {
286- do_bench_push_all_move ( b, 0 , 10 )
287- }
288-
289- #[ bench]
290- fn bench_push_all_move_0000_0100 ( b : & mut Bencher ) {
291- do_bench_push_all_move ( b, 0 , 100 )
292- }
293-
294- #[ bench]
295- fn bench_push_all_move_0000_1000 ( b : & mut Bencher ) {
296- do_bench_push_all_move ( b, 0 , 1000 )
297- }
298-
299- #[ bench]
300- fn bench_push_all_move_0010_0010 ( b : & mut Bencher ) {
301- do_bench_push_all_move ( b, 10 , 10 )
302- }
303-
304- #[ bench]
305- fn bench_push_all_move_0100_0100 ( b : & mut Bencher ) {
306- do_bench_push_all_move ( b, 100 , 100 )
307- }
308-
309- #[ bench]
310- fn bench_push_all_move_1000_1000 ( b : & mut Bencher ) {
311- do_bench_push_all_move ( b, 1000 , 1000 )
261+ fn bench_extend_from_slice_1000_1000 ( b : & mut Bencher ) {
262+ do_bench_extend_from_slice ( b, 1000 , 1000 )
312263}
313264
314265fn do_bench_clone ( b : & mut Bencher , src_len : usize ) {
0 commit comments