mirror of
https://github.com/servo/servo.git
synced 2025-07-24 15:50:21 +01:00
Move away from the repeat().take().collect() pattern.
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:
parent
6a728712f9
commit
ce4d442941
6 changed files with 7 additions and 16 deletions
|
@ -4,7 +4,6 @@
|
||||||
|
|
||||||
use euclid::point::Point2D;
|
use euclid::point::Point2D;
|
||||||
use std::cmp::{Ordering, PartialOrd};
|
use std::cmp::{Ordering, PartialOrd};
|
||||||
use std::iter::repeat;
|
|
||||||
use std::mem;
|
use std::mem;
|
||||||
use std::u16;
|
use std::u16;
|
||||||
use std::vec::Vec;
|
use std::vec::Vec;
|
||||||
|
@ -530,8 +529,7 @@ impl<'a> GlyphStore {
|
||||||
assert!(length > 0);
|
assert!(length > 0);
|
||||||
|
|
||||||
GlyphStore {
|
GlyphStore {
|
||||||
entry_buffer: repeat(GlyphEntry::initial()).take(length)
|
entry_buffer: vec![GlyphEntry::initial(); length],
|
||||||
.collect(),
|
|
||||||
detail_store: DetailedGlyphStore::new(),
|
detail_store: DetailedGlyphStore::new(),
|
||||||
is_whitespace: is_whitespace,
|
is_whitespace: is_whitespace,
|
||||||
}
|
}
|
||||||
|
|
|
@ -43,7 +43,6 @@ use libc::{c_uint, c_int, c_void, c_char};
|
||||||
use util::geometry::Au;
|
use util::geometry::Au;
|
||||||
use util::range::Range;
|
use util::range::Range;
|
||||||
use std::char;
|
use std::char;
|
||||||
use std::iter::repeat;
|
|
||||||
use std::mem;
|
use std::mem;
|
||||||
use std::cmp;
|
use std::cmp;
|
||||||
use std::ptr;
|
use std::ptr;
|
||||||
|
@ -292,10 +291,9 @@ impl Shaper {
|
||||||
|
|
||||||
// fast path: all chars are single-byte.
|
// fast path: all chars are single-byte.
|
||||||
if byte_max == char_max {
|
if byte_max == char_max {
|
||||||
byte_to_glyph = repeat(NO_GLYPH).take(byte_max).collect();
|
byte_to_glyph = vec![NO_GLYPH; byte_max];
|
||||||
} else {
|
} else {
|
||||||
byte_to_glyph = repeat(CONTINUATION_BYTE).take(byte_max)
|
byte_to_glyph = vec![CONTINUATION_BYTE; byte_max];
|
||||||
.collect();
|
|
||||||
for (i, _) in text.char_indices() {
|
for (i, _) in text.char_indices() {
|
||||||
byte_to_glyph[i] = NO_GLYPH;
|
byte_to_glyph[i] = NO_GLYPH;
|
||||||
}
|
}
|
||||||
|
|
|
@ -39,7 +39,6 @@ use net_traits::image_cache_task::UsePlaceholder;
|
||||||
use net_traits::image::base::{Image, PixelFormat};
|
use net_traits::image::base::{Image, PixelFormat};
|
||||||
use std::cmp;
|
use std::cmp;
|
||||||
use std::default::Default;
|
use std::default::Default;
|
||||||
use std::iter::repeat;
|
|
||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
use std::f32;
|
use std::f32;
|
||||||
use style::computed_values::filter::Filter;
|
use style::computed_values::filter::Filter;
|
||||||
|
@ -1104,7 +1103,7 @@ impl FragmentDisplayListBuilding for Fragment {
|
||||||
CanvasCommonMsg::SendPixelContents(sender))).unwrap();
|
CanvasCommonMsg::SendPixelContents(sender))).unwrap();
|
||||||
receiver.recv().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{
|
display_list.content.push_back(DisplayItem::ImageClass(box ImageDisplayItem{
|
||||||
base: BaseDisplayItem::new(stacking_relative_content_box,
|
base: BaseDisplayItem::new(stacking_relative_content_box,
|
||||||
|
|
|
@ -25,7 +25,6 @@ use euclid::{Point2D, Rect};
|
||||||
use gfx::display_list::DisplayList;
|
use gfx::display_list::DisplayList;
|
||||||
use std::cmp;
|
use std::cmp;
|
||||||
use std::fmt;
|
use std::fmt;
|
||||||
use std::iter;
|
|
||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
use style::computed_values::{border_collapse, border_spacing, table_layout};
|
use style::computed_values::{border_collapse, border_spacing, table_layout};
|
||||||
use style::properties::ComputedValues;
|
use style::properties::ComputedValues;
|
||||||
|
@ -718,8 +717,7 @@ fn perform_border_collapse_for_row(child_table_row: &mut TableRowFlow,
|
||||||
}
|
}
|
||||||
PreviousBlockCollapsedBorders::FromTable(collapsed_border) => {
|
PreviousBlockCollapsedBorders::FromTable(collapsed_border) => {
|
||||||
child_table_row.final_collapsed_borders.block_start =
|
child_table_row.final_collapsed_borders.block_start =
|
||||||
iter::repeat(collapsed_border).take(child_table_row.block_flow.base.children.len())
|
vec![collapsed_border; child_table_row.block_flow.base.children.len()]
|
||||||
.collect()
|
|
||||||
}
|
}
|
||||||
PreviousBlockCollapsedBorders::NotCollapsingBorders => {}
|
PreviousBlockCollapsedBorders::NotCollapsingBorders => {}
|
||||||
}
|
}
|
||||||
|
|
|
@ -5232,7 +5232,6 @@ class CGBindingRoot(CGThing):
|
||||||
'util::str::DOMString',
|
'util::str::DOMString',
|
||||||
'std::borrow::ToOwned',
|
'std::borrow::ToOwned',
|
||||||
'std::cmp',
|
'std::cmp',
|
||||||
'std::iter::repeat',
|
|
||||||
'std::mem',
|
'std::mem',
|
||||||
'std::num',
|
'std::num',
|
||||||
'std::ptr',
|
'std::ptr',
|
||||||
|
@ -5555,7 +5554,7 @@ class CallbackMember(CGNativeMember):
|
||||||
if self.argCount > 0:
|
if self.argCount > 0:
|
||||||
replacements["argCount"] = self.argCountStr
|
replacements["argCount"] = self.argCountStr
|
||||||
replacements["argvDecl"] = string.Template(
|
replacements["argvDecl"] = string.Template(
|
||||||
"let mut argv = repeat(UndefinedValue()).take(${argCount}).collect::<Vec<_>>();\n"
|
"let mut argv = vec![UndefinedValue(); ${argCount}];\n"
|
||||||
).substitute(replacements)
|
).substitute(replacements)
|
||||||
else:
|
else:
|
||||||
# Avoid weird 0-sized arrays
|
# Avoid weird 0-sized arrays
|
||||||
|
|
|
@ -7,7 +7,6 @@ use std::collections::hash_map::Entry::{Occupied, Vacant};
|
||||||
use std::collections::hash_state::DefaultState;
|
use std::collections::hash_state::DefaultState;
|
||||||
use rand::Rng;
|
use rand::Rng;
|
||||||
use std::hash::{Hash, Hasher, SipHasher};
|
use std::hash::{Hash, Hasher, SipHasher};
|
||||||
use std::iter::repeat;
|
|
||||||
use rand;
|
use rand;
|
||||||
use std::slice::Iter;
|
use std::slice::Iter;
|
||||||
use std::default::Default;
|
use std::default::Default;
|
||||||
|
@ -121,7 +120,7 @@ impl<K:Clone+Eq+Hash,V:Clone> SimpleHashCache<K,V> {
|
||||||
pub fn new(cache_size: usize) -> SimpleHashCache<K,V> {
|
pub fn new(cache_size: usize) -> SimpleHashCache<K,V> {
|
||||||
let mut r = rand::thread_rng();
|
let mut r = rand::thread_rng();
|
||||||
SimpleHashCache {
|
SimpleHashCache {
|
||||||
entries: repeat(None).take(cache_size).collect(),
|
entries: vec![None; cache_size],
|
||||||
k0: r.gen(),
|
k0: r.gen(),
|
||||||
k1: r.gen(),
|
k1: r.gen(),
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue