Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 12:40:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

Move away from the repeat().take().collect() pattern.

Browse source 
This was the preferred pattern between the deprecation of Vec::from_elem and
the addition of the count argument to the vec![] macro.
This commit is contained in:
Ms2ger 2015-07-14 16:19:29 +02:00
parent 6a728712f9
commit ce4d442941
6 changed files with 7 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

3
components/layout/display_list_builder.rs
View file

@ -39,7 +39,6 @@ use net_traits::image_cache_task::UsePlaceholder;
use net_traits::image::base::{Image, PixelFormat};
use std::cmp;
use std::default::Default;
use std::iter::repeat;
use std::sync::Arc;
use std::f32;
use style::computed_values::filter::Filter;
@ -1104,7 +1103,7 @@ impl FragmentDisplayListBuilding for Fragment {
CanvasCommonMsg::SendPixelContents(sender))).unwrap();
receiver.recv().unwrap()
},
None => repeat(0xFFu8).take(width * height * 4).collect(),
None => vec![0xFFu8; width * height * 4],
};
display_list.content.push_back(DisplayItem::ImageClass(box ImageDisplayItem{
base: BaseDisplayItem::new(stacking_relative_content_box,

4
components/layout/table.rs
View file

@ -25,7 +25,6 @@ use euclid::{Point2D, Rect};
use gfx::display_list::DisplayList;
use std::cmp;
use std::fmt;
use std::iter;
use std::sync::Arc;
use style::computed_values::{border_collapse, border_spacing, table_layout};
use style::properties::ComputedValues;
@ -718,8 +717,7 @@ fn perform_border_collapse_for_row(child_table_row: &mut TableRowFlow,
}
PreviousBlockCollapsedBorders::FromTable(collapsed_border) => {
child_table_row.final_collapsed_borders.block_start =
iter::repeat(collapsed_border).take(child_table_row.block_flow.base.children.len())
.collect()
vec![collapsed_border; child_table_row.block_flow.base.children.len()]
}
PreviousBlockCollapsedBorders::NotCollapsingBorders => {}
}