aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMatt Murphy <matthew.john.murphy@gmail.com>2014-04-29 18:37:38 -0500
committerMs2ger <ms2ger@gmail.com>2014-05-04 23:16:18 +0200
commitaf920f442b2c494b5061a44c406aeb1d495ee2aa (patch)
tree3ea7e7263d75866b34f00fd70259311f170b6231 /src
parent4d595b7d8c0f39aaaf2495edd152b7d568a83c31 (diff)
downloadservo-af920f442b2c494b5061a44c406aeb1d495ee2aa.tar.gz
servo-af920f442b2c494b5061a44c406aeb1d495ee2aa.zip
Convert Vec::new() to vec!()
Diffstat (limited to 'src')
-rw-r--r--src/components/gfx/buffer_map.rs2
-rw-r--r--src/components/gfx/font.rs4
-rw-r--r--src/components/gfx/font_context.rs2
-rw-r--r--src/components/gfx/font_list.rs2
-rw-r--r--src/components/gfx/render_task.rs2
-rw-r--r--src/components/gfx/text/glyph.rs6
-rw-r--r--src/components/gfx/text/shaping/harfbuzz.rs2
-rw-r--r--src/components/gfx/text/text_run.rs2
-rw-r--r--src/components/gfx/text/util.rs6
-rw-r--r--src/components/main/compositing/compositor_layer.rs6
-rw-r--r--src/components/main/compositing/quadtree.rs20
-rw-r--r--src/components/main/constellation.rs16
-rw-r--r--src/components/main/layout/box_.rs10
-rw-r--r--src/components/main/layout/construct.rs10
-rw-r--r--src/components/main/layout/floats.rs2
-rw-r--r--src/components/main/layout/layout_task.rs2
-rw-r--r--src/components/main/layout/table.rs24
-rw-r--r--src/components/main/layout/table_colgroup.rs6
-rw-r--r--src/components/main/layout/table_row.rs18
-rw-r--r--src/components/main/layout/table_rowgroup.rs18
-rw-r--r--src/components/main/layout/table_wrapper.rs12
-rw-r--r--src/components/main/layout/text.rs8
-rw-r--r--src/components/main/layout/wrapper.rs2
-rw-r--r--src/components/main/platform/common/glfw_windowing.rs2
-rw-r--r--src/components/main/platform/common/glut_windowing.rs2
-rwxr-xr-xsrc/components/main/servo.rs4
-rw-r--r--src/components/net/file_loader.rs2
-rw-r--r--src/components/net/resource_task.rs2
-rw-r--r--src/components/script/dom/node.rs2
-rw-r--r--src/components/script/html/hubbub_html_parser.rs4
-rw-r--r--src/components/script/script_task.rs6
-rw-r--r--src/components/style/media_queries.rs4
-rw-r--r--src/components/style/properties.rs.mako8
-rw-r--r--src/components/style/selector_matching.rs2
-rw-r--r--src/components/style/selectors.rs8
-rw-r--r--src/components/style/stylesheets.rs4
-rw-r--r--src/components/util/cache.rs2
-rw-r--r--src/components/util/time.rs30
-rw-r--r--src/components/util/url.rs3
39 files changed, 133 insertions, 134 deletions
diff --git a/src/components/gfx/buffer_map.rs b/src/components/gfx/buffer_map.rs
index ea16f5f4e1b..33ab8a4b5d2 100644
--- a/src/components/gfx/buffer_map.rs
+++ b/src/components/gfx/buffer_map.rs
@@ -86,7 +86,7 @@ impl<T: Tile> BufferMap<T> {
// use lazy insertion function to prevent unnecessary allocation
let counter = &self.counter;
self.map.find_or_insert_with(new_key, |_| BufferValue {
- buffers: Vec::new(),
+ buffers: vec!(),
last_action: *counter
}).buffers.push(new_buffer);
diff --git a/src/components/gfx/font.rs b/src/components/gfx/font.rs
index fbb1ba2a7b2..aa389e00664 100644
--- a/src/components/gfx/font.rs
+++ b/src/components/gfx/font.rs
@@ -160,7 +160,7 @@ impl FontGroup {
}
pub fn teardown(&mut self) {
- self.fonts = Vec::new();
+ self.fonts = vec!();
}
pub fn create_textrun(&self, text: ~str, decoration: text_decoration::T) -> TextRun {
@@ -361,7 +361,7 @@ impl Font {
};
let mut origin = baseline_origin.clone();
- let mut azglyphs = Vec::new();
+ let mut azglyphs = vec!();
azglyphs.reserve(range.length());
for (glyphs, _offset, slice_range) in run.iter_slices_for_range(range) {
diff --git a/src/components/gfx/font_context.rs b/src/components/gfx/font_context.rs
index 623160cb804..021a1b57996 100644
--- a/src/components/gfx/font_context.rs
+++ b/src/components/gfx/font_context.rs
@@ -116,7 +116,7 @@ impl FontContext {
}
fn create_font_group(&mut self, style: &SpecifiedFontStyle) -> Rc<RefCell<FontGroup>> {
- let mut fonts = Vec::new();
+ let mut fonts = vec!();
debug!("(create font group) --- starting ---");
diff --git a/src/components/gfx/font_list.rs b/src/components/gfx/font_list.rs
index fd2a24eb6c5..ceda9619eb5 100644
--- a/src/components/gfx/font_list.rs
+++ b/src/components/gfx/font_list.rs
@@ -91,7 +91,7 @@ impl FontFamily {
pub fn new(family_name: &str) -> FontFamily {
FontFamily {
family_name: family_name.to_str(),
- entries: Vec::new(),
+ entries: vec!(),
}
}
diff --git a/src/components/gfx/render_task.rs b/src/components/gfx/render_task.rs
index ca680dec97c..958989bf3fb 100644
--- a/src/components/gfx/render_task.rs
+++ b/src/components/gfx/render_task.rs
@@ -293,7 +293,7 @@ impl<C: RenderListener + Send> RenderTask<C> {
fn render(&mut self, tiles: Vec<BufferRequest>, scale: f32, layer_id: LayerId) {
time::profile(time::RenderingCategory, self.profiler_chan.clone(), || {
// FIXME: Try not to create a new array here.
- let mut new_buffers = Vec::new();
+ let mut new_buffers = vec!();
// Find the appropriate render layer.
let render_layer = match self.render_layers.iter().find(|layer| layer.id == layer_id) {
diff --git a/src/components/gfx/text/glyph.rs b/src/components/gfx/text/glyph.rs
index d0693045b80..f48cee8997e 100644
--- a/src/components/gfx/text/glyph.rs
+++ b/src/components/gfx/text/glyph.rs
@@ -310,8 +310,8 @@ struct DetailedGlyphStore {
impl<'a> DetailedGlyphStore {
fn new() -> DetailedGlyphStore {
DetailedGlyphStore {
- detail_buffer: Vec::new(), // TODO: default size?
- detail_lookup: Vec::new(),
+ detail_buffer: vec!(), // TODO: default size?
+ detail_lookup: vec!(),
lookup_is_sorted: false
}
}
@@ -403,7 +403,7 @@ impl<'a> DetailedGlyphStore {
// immutable locations thus don't play well with freezing.
// Thar be dragons here. You have been warned. (Tips accepted.)
- let mut unsorted_records: Vec<DetailedGlyphRecord> = Vec::new();
+ let mut unsorted_records: Vec<DetailedGlyphRecord> = vec!();
mem::swap(&mut self.detail_lookup, &mut unsorted_records);
let mut mut_records : Vec<DetailedGlyphRecord> = unsorted_records;
mut_records.sort_by(|a, b| {
diff --git a/src/components/gfx/text/shaping/harfbuzz.rs b/src/components/gfx/text/shaping/harfbuzz.rs
index 31a3ee7881e..2eefc4f95e3 100644
--- a/src/components/gfx/text/shaping/harfbuzz.rs
+++ b/src/components/gfx/text/shaping/harfbuzz.rs
@@ -411,7 +411,7 @@ impl Shaper {
glyphs.add_glyph_for_char_index(char_idx, &data);
} else {
// collect all glyphs to be assigned to the first character.
- let mut datas = Vec::new();
+ let mut datas = vec!();
for glyph_i in glyph_span.eachi() {
let shape = glyph_data.get_entry_for_glyph(glyph_i, &mut y_pos);
diff --git a/src/components/gfx/text/text_run.rs b/src/components/gfx/text/text_run.rs
index fe623dc1f64..e65ef22c264 100644
--- a/src/components/gfx/text/text_run.rs
+++ b/src/components/gfx/text/text_run.rs
@@ -116,7 +116,7 @@ impl<'a> TextRun {
pub fn break_and_shape(font: &mut Font, text: &str) -> Vec<Arc<GlyphStore>> {
// TODO(Issue #230): do a better job. See Gecko's LineBreaker.
- let mut glyphs = Vec::new();
+ let mut glyphs = vec!();
let mut byte_i = 0u;
let mut cur_slice_is_whitespace = false;
let mut byte_last_boundary = 0;
diff --git a/src/components/gfx/text/util.rs b/src/components/gfx/text/util.rs
index a149af36c01..1f4fa172018 100644
--- a/src/components/gfx/text/util.rs
+++ b/src/components/gfx/text/util.rs
@@ -149,7 +149,7 @@ fn test_transform_compress_none() {
let mode = CompressNone;
for i in range(0, test_strs.len()) {
- let mut new_line_pos = Vec::new();
+ let mut new_line_pos = vec!();
let (trimmed_str, _out) = transform_text(test_strs[i], mode, true, &mut new_line_pos);
assert_eq!(&trimmed_str, &test_strs[i])
}
@@ -178,7 +178,7 @@ fn test_transform_discard_newline() {
let mode = DiscardNewline;
for i in range(0, test_strs.len()) {
- let mut new_line_pos = Vec::new();
+ let mut new_line_pos = vec!();
let (trimmed_str, _out) = transform_text(test_strs[i], mode, true, &mut new_line_pos);
assert_eq!(&trimmed_str, &oracle_strs[i])
}
@@ -266,7 +266,7 @@ fn test_transform_compress_whitespace_newline_no_incoming() {
let mode = CompressWhitespaceNewline;
for i in range(0, test_strs.len()) {
- let mut new_line_pos = Vec::new();
+ let mut new_line_pos = vec!();
let (trimmed_str, _out) = transform_text(test_strs[i], mode, false, &mut new_line_pos);
assert_eq!(&trimmed_str, &oracle_strs[i])
}
diff --git a/src/components/main/compositing/compositor_layer.rs b/src/components/main/compositing/compositor_layer.rs
index 8c9e5667ff8..a1ef5b95bd3 100644
--- a/src/components/main/compositing/compositor_layer.rs
+++ b/src/components/main/compositing/compositor_layer.rs
@@ -170,7 +170,7 @@ impl CompositorLayer {
bounds: bounds,
page_size: page_size,
scroll_offset: Point2D(0f32, 0f32),
- children: Vec::new(),
+ children: vec!(),
quadtree: match page_size {
None => NoTree(tile_size, Some(MAX_TILE_MEMORY_PER_LAYER)),
Some(page_size) => {
@@ -203,7 +203,7 @@ impl CompositorLayer {
bounds: Rect(Point2D(0f32, 0f32), page_size),
page_size: Some(page_size),
scroll_offset: Point2D(0f32, 0f32),
- children: Vec::new(),
+ children: vec!(),
quadtree: NoTree(tile_size, Some(MAX_TILE_MEMORY_PER_LAYER)),
root_layer: Rc::new(ContainerLayer()),
hidden: false,
@@ -841,7 +841,7 @@ impl CompositorLayer {
Tree(ref mut quadtree) => quadtree,
};
- let mut unused_tiles = Vec::new();
+ let mut unused_tiles = vec!();
for buffer in new_buffers.buffers.move_iter() {
unused_tiles.push_all_move(quadtree.add_tile_pixel(buffer.screen_pos.origin.x,
buffer.screen_pos.origin.y,
diff --git a/src/components/main/compositing/quadtree.rs b/src/components/main/compositing/quadtree.rs
index 1741de6c8ca..8e5354aff61 100644
--- a/src/components/main/compositing/quadtree.rs
+++ b/src/components/main/compositing/quadtree.rs
@@ -269,7 +269,7 @@ impl<T: Tile> QuadtreeNode<T> {
/// Get all tiles in the tree, parents first.
fn get_all_tiles<'r>(&'r self) -> Vec<&'r T> {
- let mut ret = Vec::new();
+ let mut ret = vec!();
match self.tile {
Some(ref tile) => ret.push(tile),
@@ -303,7 +303,7 @@ impl<T: Tile> QuadtreeNode<T> {
self.tile_mem = tile.get_mem();
let mut unused_tiles = match replace(&mut self.tile, Some(tile)) {
Some(old_tile) => vec!(old_tile),
- None => Vec::new(),
+ None => vec!(),
};
for child in self.quadrants.mut_iter() {
match *child {
@@ -479,7 +479,7 @@ impl<T: Tile> QuadtreeNode<T> {
if w_x + w_width < s_x || w_x > s_x + s_size
|| w_y + w_height < s_y || w_y > s_y + s_size
|| w_x >= clip.width || w_y >= clip.height {
- return (Vec::new(), Vec::new(), 0);
+ return (vec!(), vec!(), 0);
}
// clip window to visible region
@@ -488,7 +488,7 @@ impl<T: Tile> QuadtreeNode<T> {
if s_size <= tile_size { // We are the child
return match self.tile {
- _ if self.status == Rendering || self.status == Hidden => (Vec::new(), Vec::new(), 0),
+ _ if self.status == Rendering || self.status == Hidden => (vec!(), vec!(), 0),
Some(ref tile) if tile.is_valid(scale) && !override
&& self.status != Invalid => {
let redisplay = match self.quadrants {
@@ -496,7 +496,7 @@ impl<T: Tile> QuadtreeNode<T> {
_ => true,
};
let mut delta = 0;
- let mut unused_tiles = Vec::new();
+ let mut unused_tiles = vec!();
if redisplay {
let old_mem = self.tile_mem;
for child in self.quadrants.mut_iter() {
@@ -512,9 +512,9 @@ impl<T: Tile> QuadtreeNode<T> {
delta = self.tile_mem as int - old_mem as int;
}
- (Vec::new(), unused_tiles, delta)
+ (vec!(), unused_tiles, delta)
}
- _ => (vec!(self.get_tile_rect(s_x, s_y, clip.width, clip.height, scale, tile_size)), Vec::new(), 0),
+ _ => (vec!(self.get_tile_rect(s_x, s_y, clip.width, clip.height, scale, tile_size)), vec!(), 0),
}
}
@@ -548,8 +548,8 @@ impl<T: Tile> QuadtreeNode<T> {
let quads_to_check = slice::build(Some(4), builder);
- let mut request = Vec::new();
- let mut unused = Vec::new();
+ let mut request = vec!();
+ let mut unused = vec!();
let mut delta = 0;
for quad in quads_to_check.iter() {
@@ -607,7 +607,7 @@ impl<T: Tile> QuadtreeNode<T> {
fn collect_tiles(&mut self) -> Vec<T> {
let mut ret = match replace(&mut self.tile, None) {
Some(tile) => vec!(tile),
- None => Vec::new(),
+ None => vec!(),
};
for child in self.quadrants.mut_iter() {
match *child {
diff --git a/src/components/main/constellation.rs b/src/components/main/constellation.rs
index b302824d57d..4de6ca19820 100644
--- a/src/components/main/constellation.rs
+++ b/src/components/main/constellation.rs
@@ -185,8 +185,8 @@ struct NavigationContext {
impl NavigationContext {
fn new() -> NavigationContext {
NavigationContext {
- previous: Vec::new(),
- next: Vec::new(),
+ previous: vec!(),
+ next: vec!(),
current: None,
}
}
@@ -211,7 +211,7 @@ impl NavigationContext {
/// Loads a new set of page frames, returning all evicted frame trees
fn load(&mut self, frame_tree: Rc<FrameTree>) -> Vec<Rc<FrameTree>> {
debug!("navigating to {:?}", frame_tree.pipeline.id);
- let evicted = replace(&mut self.next, Vec::new());
+ let evicted = replace(&mut self.next, vec!());
if self.current.is_some() {
self.previous.push(self.current.take_unwrap());
}
@@ -265,7 +265,7 @@ impl Constellation {
pipelines: HashMap::new(),
navigation_context: NavigationContext::new(),
next_pipeline_id: PipelineId(0),
- pending_frames: Vec::new(),
+ pending_frames: vec!(),
pending_sizes: HashMap::new(),
profiler_chan: profiler_chan,
window_size: Size2D(800u, 600u),
@@ -438,7 +438,7 @@ impl Constellation {
after: Rc::new(FrameTree {
pipeline: pipeline_wrapped.clone(),
parent: RefCell::new(None),
- children: RefCell::new(Vec::new()),
+ children: RefCell::new(vec!()),
}),
navigation_type: constellation_msg::Load,
});
@@ -464,7 +464,7 @@ impl Constellation {
after: Rc::new(FrameTree {
pipeline: pipeline_wrapped.clone(),
parent: RefCell::new(None),
- children: RefCell::new(Vec::new()),
+ children: RefCell::new(vec!()),
}),
navigation_type: constellation_msg::Load,
});
@@ -611,7 +611,7 @@ impl Constellation {
frame_tree: Rc::new(FrameTree {
pipeline: pipeline_wrapped.clone(),
parent: RefCell::new(Some(source_pipeline.clone())),
- children: RefCell::new(Vec::new()),
+ children: RefCell::new(vec!()),
}),
rect: rect,
});
@@ -664,7 +664,7 @@ impl Constellation {
after: Rc::new(FrameTree {
pipeline: pipeline_wrapped.clone(),
parent: parent,
- children: RefCell::new(Vec::new()),
+ children: RefCell::new(vec!()),
}),
navigation_type: constellation_msg::Load,
});
diff --git a/src/components/main/layout/box_.rs b/src/components/main/layout/box_.rs
index fe5eff68402..f3544fc4e62 100644
--- a/src/components/main/layout/box_.rs
+++ b/src/components/main/layout/box_.rs
@@ -313,7 +313,7 @@ impl Box {
border_padding: Zero::zero(),
margin: Zero::zero(),
specific: constructor.build_specific_box_info_for_node(node),
- new_line_pos: Vec::new(),
+ new_line_pos: vec!(),
}
}
@@ -326,7 +326,7 @@ impl Box {
border_padding: Zero::zero(),
margin: Zero::zero(),
specific: specific,
- new_line_pos: Vec::new(),
+ new_line_pos: vec!(),
}
}
@@ -350,7 +350,7 @@ impl Box {
border_padding: Zero::zero(),
margin: Zero::zero(),
specific: specific,
- new_line_pos: Vec::new(),
+ new_line_pos: vec!(),
}
}
@@ -366,7 +366,7 @@ impl Box {
border_padding: Zero::zero(),
margin: Zero::zero(),
specific: specific,
- new_line_pos: Vec::new(),
+ new_line_pos: vec!(),
}
}
@@ -1114,7 +1114,7 @@ impl Box {
let new_text_box_info = ScannedTextBoxInfo::new(text_box_info.run.clone(), left_range);
let new_metrics = new_text_box_info.run.metrics_for_range(&left_range);
let mut new_box = self.transform(new_metrics.bounding_box.size, ScannedTextBox(new_text_box_info));
- new_box.new_line_pos = Vec::new();
+ new_box.new_line_pos = vec!();
Some(new_box)
};
diff --git a/src/components/main/layout/construct.rs b/src/components/main/layout/construct.rs
index 6bf95bd85f9..42a3d87ee0e 100644
--- a/src/components/main/layout/construct.rs
+++ b/src/components/main/layout/construct.rs
@@ -502,7 +502,7 @@ impl<'a> FlowConstructor<'a> {
whitespace_stripping,
node);
if !consecutive_siblings.is_empty() {
- let consecutive_siblings = mem::replace(consecutive_siblings, Vec::new());
+ let consecutive_siblings = mem::replace(consecutive_siblings, vec!());
self.generate_anonymous_missing_child(consecutive_siblings,
flow,
node);
@@ -588,7 +588,7 @@ impl<'a> FlowConstructor<'a> {
-> ConstructionResult {
// Gather up boxes for the inline flows we might need to create.
let mut inline_box_accumulator = InlineBoxAccumulator::new();
- let mut consecutive_siblings = Vec::new();
+ let mut consecutive_siblings = vec!();
let mut first_box = true;
// List of absolute descendants, in tree order.
@@ -811,7 +811,7 @@ impl<'a> FlowConstructor<'a> {
flow: &mut ~Flow:Share,
node: &ThreadSafeLayoutNode) {
let mut anonymous_flow = flow.generate_missing_child_flow(node);
- let mut consecutive_siblings = Vec::new();
+ let mut consecutive_siblings = vec!();
for kid_flow in child_flows.move_iter() {
if anonymous_flow.need_anonymous_flow(kid_flow) {
consecutive_siblings.push(kid_flow);
@@ -819,7 +819,7 @@ impl<'a> FlowConstructor<'a> {
}
if !consecutive_siblings.is_empty() {
self.generate_anonymous_missing_child(consecutive_siblings, &mut anonymous_flow, node);
- consecutive_siblings = Vec::new();
+ consecutive_siblings = vec!();
}
anonymous_flow.add_new_child(kid_flow);
}
@@ -931,7 +931,7 @@ impl<'a> FlowConstructor<'a> {
fn build_flow_for_table_colgroup(&mut self, node: &ThreadSafeLayoutNode) -> ConstructionResult {
let box_ = Box::new_from_specific_info(node,
TableColumnBox(TableColumnBoxInfo::new(node)));
- let mut col_boxes = Vec::new();
+ let mut col_boxes = vec!();
for kid in node.children() {
// CSS 2.1 § 17.2.1. Treat all non-column child boxes of `table-column-group`
// as `display: none`.
diff --git a/src/components/main/layout/floats.rs b/src/components/main/layout/floats.rs
index 3144629f405..4f58da33e33 100644
--- a/src/components/main/layout/floats.rs
+++ b/src/components/main/layout/floats.rs
@@ -58,7 +58,7 @@ struct FloatList {
impl FloatList {
fn new() -> FloatList {
FloatList {
- floats: Vec::new(),
+ floats: vec!(),
max_top: Au(0),
}
}
diff --git a/src/components/main/layout/layout_task.rs b/src/components/main/layout/layout_task.rs
index ea4cd79c1ea..e21cd7a52c8 100644
--- a/src/components/main/layout/layout_task.rs
+++ b/src/components/main/layout/layout_task.rs
@@ -795,7 +795,7 @@ impl LayoutTask {
}
}
- let mut boxes = Vec::new();
+ let mut boxes = vec!();
match self.display_list {
None => fail!("no display list!"),
Some(ref display_list) => {
diff --git a/src/components/main/layout/table.rs b/src/components/main/layout/table.rs
index 9562c881aac..ce608ad569a 100644
--- a/src/components/main/layout/table.rs
+++ b/src/components/main/layout/table.rs
@@ -50,9 +50,9 @@ impl TableFlow {
};
TableFlow {
block_flow: block_flow,
- col_widths: Vec::new(),
- col_min_widths: Vec::new(),
- col_pref_widths: Vec::new(),
+ col_widths: vec!(),
+ col_min_widths: vec!(),
+ col_pref_widths: vec!(),
table_layout: table_layout
}
}
@@ -69,9 +69,9 @@ impl TableFlow {
};
TableFlow {
block_flow: block_flow,
- col_widths: Vec::new(),
- col_min_widths: Vec::new(),
- col_pref_widths: Vec::new(),
+ col_widths: vec!(),
+ col_min_widths: vec!(),
+ col_pref_widths: vec!(),
table_layout: table_layout
}
}
@@ -89,18 +89,18 @@ impl TableFlow {
};
TableFlow {
block_flow: block_flow,
- col_widths: Vec::new(),
- col_min_widths: Vec::new(),
- col_pref_widths: Vec::new(),
+ col_widths: vec!(),
+ col_min_widths: vec!(),
+ col_pref_widths: vec!(),
table_layout: table_layout
}
}
pub fn teardown(&mut self) {
self.block_flow.teardown();
- self.col_widths = Vec::new();
- self.col_min_widths = Vec::new();
- self.col_pref_widths = Vec::new();
+ self.col_widths = vec!();
+ self.col_min_widths = vec!();
+ self.col_pref_widths = vec!();
}
/// Update the corresponding value of self_widths if a value of kid_widths has larger value
diff --git a/src/components/main/layout/table_colgroup.rs b/src/components/main/layout/table_colgroup.rs
index 8269e4eac75..2edcab3cd0c 100644
--- a/src/components/main/layout/table_colgroup.rs
+++ b/src/components/main/layout/table_colgroup.rs
@@ -34,7 +34,7 @@ impl TableColGroupFlow {
base: BaseFlow::new((*node).clone()),
box_: Some(box_),
cols: boxes,
- widths: Vec::new(),
+ widths: vec!(),
}
}
@@ -43,8 +43,8 @@ impl TableColGroupFlow {
box_.teardown();
}
self.box_ = None;
- self.cols = Vec::new();
- self.widths = Vec::new();
+ self.cols = vec!();
+ self.widths = vec!();
}
}
diff --git a/src/components/main/layout/table_row.rs b/src/components/main/layout/table_row.rs
index cf23ce2e2d4..4560526ef35 100644
--- a/src/components/main/layout/table_row.rs
+++ b/src/components/main/layout/table_row.rs
@@ -38,9 +38,9 @@ impl TableRowFlow {
-> TableRowFlow {
TableRowFlow {
block_flow: BlockFlow::from_node_and_box(node, box_),
- col_widths: Vec::new(),
- col_min_widths: Vec::new(),
- col_pref_widths: Vec::new(),
+ col_widths: vec!(),
+ col_min_widths: vec!(),
+ col_pref_widths: vec!(),
}
}
@@ -49,17 +49,17 @@ impl TableRowFlow {
-> TableRowFlow {
TableRowFlow {
block_flow: BlockFlow::from_node(constructor, node),
- col_widths: Vec::new(),
- col_min_widths: Vec::new(),
- col_pref_widths: Vec::new(),
+ col_widths: vec!(),
+ col_min_widths: vec!(),
+ col_pref_widths: vec!(),
}
}
pub fn teardown(&mut self) {
self.block_flow.teardown();
- self.col_widths = Vec::new();
- self.col_min_widths = Vec::new();
- self.col_pref_widths = Vec::new();
+ self.col_widths = vec!();
+ self.col_min_widths = vec!();
+ self.col_pref_widths = vec!();
}
pub fn box_<'a>(&'a mut self) -> &'a Box {
diff --git a/src/components/main/layout/table_rowgroup.rs b/src/components/main/layout/table_rowgroup.rs
index 608cf24033f..ca3bf8ca4b5 100644
--- a/src/components/main/layout/table_rowgroup.rs
+++ b/src/components/main/layout/table_rowgroup.rs
@@ -37,9 +37,9 @@ impl TableRowGroupFlow {
-> TableRowGroupFlow {
TableRowGroupFlow {
block_flow: BlockFlow::from_node_and_box(node, box_),
- col_widths: Vec::new(),
- col_min_widths: Vec::new(),
- col_pref_widths: Vec::new(),
+ col_widths: vec!(),
+ col_min_widths: vec!(),
+ col_pref_widths: vec!(),
}
}
@@ -48,17 +48,17 @@ impl TableRowGroupFlow {
-> TableRowGroupFlow {
TableRowGroupFlow {
block_flow: BlockFlow::from_node(constructor, node),
- col_widths: Vec::new(),
- col_min_widths: Vec::new(),
- col_pref_widths: Vec::new(),
+ col_widths: vec!(),
+ col_min_widths: vec!(),
+ col_pref_widths: vec!(),
}
}
pub fn teardown(&mut self) {
self.block_flow.teardown();
- self.col_widths = Vec::new();
- self.col_min_widths = Vec::new();
- self.col_pref_widths = Vec::new();
+ self.col_widths = vec!();
+ self.col_min_widths = vec!();
+ self.col_pref_widths = vec!();
}
pub fn box_<'a>(&'a mut self) -> &'a Box {
diff --git a/src/components/main/layout/table_wrapper.rs b/src/components/main/layout/table_wrapper.rs
index 5a6a47bc96d..bdcc501703d 100644
--- a/src/components/main/layout/table_wrapper.rs
+++ b/src/components/main/layout/table_wrapper.rs
@@ -47,7 +47,7 @@ impl TableWrapperFlow {
};
TableWrapperFlow {
block_flow: block_flow,
- col_widths: Vec::new(),
+ col_widths: vec!(),
table_layout: table_layout
}
}
@@ -64,7 +64,7 @@ impl TableWrapperFlow {
};
TableWrapperFlow {
block_flow: block_flow,
- col_widths: Vec::new(),
+ col_widths: vec!(),
table_layout: table_layout
}
}
@@ -82,7 +82,7 @@ impl TableWrapperFlow {
};
TableWrapperFlow {
block_flow: block_flow,
- col_widths: Vec::new(),
+ col_widths: vec!(),
table_layout: table_layout
}
}
@@ -93,7 +93,7 @@ impl TableWrapperFlow {
pub fn teardown(&mut self) {
self.block_flow.teardown();
- self.col_widths = Vec::new();
+ self.col_widths = vec!();
}
/// Assign height for table-wrapper flow.
@@ -257,8 +257,8 @@ impl TableWrapper {
let mut cap_min = Au(0);
let mut cols_min = Au(0);
let mut cols_max = Au(0);
- let mut col_min_widths = &Vec::new();
- let mut col_pref_widths = &Vec::new();
+ let mut col_min_widths = &vec!();
+ let mut col_pref_widths = &vec!();
for kid in table_wrapper.block_flow.base.child_iter() {
if kid.is_table_caption() {
cap_min = kid.as_block().base.intrinsic_widths.minimum_width;
diff --git a/src/components/main/layout/text.rs b/src/components/main/layout/text.rs
index 6c77688c02c..2b048bf60c8 100644
--- a/src/components/main/layout/text.rs
+++ b/src/components/main/layout/text.rs
@@ -137,7 +137,7 @@ impl TextRunScanner {
white_space::pre => CompressNone,
};
- let mut new_line_pos = Vec::new();
+ let mut new_line_pos = vec!();
let (transformed_text, whitespace) = transform_text(*text,
compression,
@@ -181,7 +181,7 @@ impl TextRunScanner {
white_space::pre => CompressNone,
};
- let mut new_line_positions: Vec<NewLinePositions> = Vec::new();
+ let mut new_line_positions: Vec<NewLinePositions> = vec!();
// First, transform/compress text of all the nodes.
let mut last_whitespace_in_clump = new_whitespace;
@@ -195,7 +195,7 @@ impl TextRunScanner {
_ => fail!("Expected an unscanned text box!"),
};
- let mut new_line_pos = Vec::new();
+ let mut new_line_pos = vec!();
let (new_str, new_whitespace) = transform_text(*in_box,
compression,
@@ -211,7 +211,7 @@ impl TextRunScanner {
// Next, concatenate all of the transformed strings together, saving the new
// character indices.
let mut run_str: ~str = "".to_owned();
- let mut new_ranges: Vec<Range> = Vec::new();
+ let mut new_ranges: Vec<Range> = vec!();
let mut char_total = 0;
for i in range(0, transformed_strs.len()) {
let added_chars = transformed_strs.get(i).char_len();
diff --git a/src/components/main/layout/wrapper.rs b/src/components/main/layout/wrapper.rs
index 9a23c15fa4c..0b2bb795545 100644
--- a/src/components/main/layout/wrapper.rs
+++ b/src/components/main/layout/wrapper.rs
@@ -204,7 +204,7 @@ impl<'ln> LayoutNode<'ln> {
///
/// FIXME(pcwalton): Terribly inefficient. We should use parallelism.
pub fn traverse_preorder(&self) -> LayoutTreeIterator<'ln> {
- let mut nodes = Vec::new();
+ let mut nodes = vec!();
gather_layout_nodes(self, &mut nodes, false);
LayoutTreeIterator::new(nodes)
}
diff --git a/src/components/main/platform/common/glfw_windowing.rs b/src/components/main/platform/common/glfw_windowing.rs
index 00fcc01de66..d200e5c9443 100644
--- a/src/components/main/platform/common/glfw_windowing.rs
+++ b/src/components/main/platform/common/glfw_windowing.rs
@@ -116,7 +116,7 @@ impl WindowMethods<Application> for Window {
glfw_window: glfw_window,
events: events,
- event_queue: RefCell::new(Vec::new()),
+ event_queue: RefCell::new(vec!()),
drag_origin: Point2D(0 as c_int, 0),
diff --git a/src/components/main/platform/common/glut_windowing.rs b/src/components/main/platform/common/glut_windowing.rs
index 9f9e59df101..09894d249d9 100644
--- a/src/components/main/platform/common/glut_windowing.rs
+++ b/src/components/main/platform/common/glut_windowing.rs
@@ -70,7 +70,7 @@ impl WindowMethods<Application> for Window {
let window = Window {
glut_window: glut_window,
- event_queue: RefCell::new(Vec::new()),
+ event_queue: RefCell::new(vec!()),
drag_origin: Point2D(0 as c_int, 0),
diff --git a/src/components/main/servo.rs b/src/components/main/servo.rs
index 746b7d2e260..d07f24f15d2 100755
--- a/src/components/main/servo.rs
+++ b/src/components/main/servo.rs
@@ -137,7 +137,7 @@ fn start(argc: int, argv: **u8) -> int {
#[no_mangle]
pub extern "C" fn android_start(argc: int, argv: **u8) -> int {
native::start(argc, argv, proc() {
- let mut args: Vec<~str> = Vec::new();
+ let mut args: Vec<~str> = vec!();
for i in range(0u, argc as uint) {
unsafe {
args.push(str::raw::from_c_str(*argv.offset(i as int) as *i8));
@@ -193,7 +193,7 @@ fn run(opts: opts::Opts) {
// As a hack for easier command-line testing,
// assume that data URLs are not URL-encoded.
Url::new("data".to_owned(), None, "".to_owned(), None,
- filename.slice_from(5).to_owned(), Vec::new(), None)
+ filename.slice_from(5).to_owned(), vec!(), None)
} else {
parse_url(*filename, None)
};
diff --git a/src/components/net/file_loader.rs b/src/components/net/file_loader.rs
index 45d46e53840..57f356864a7 100644
--- a/src/components/net/file_loader.rs
+++ b/src/components/net/file_loader.rs
@@ -14,7 +14,7 @@ static READ_SIZE: uint = 1;
fn read_all(reader: &mut io::Stream, progress_chan: &Sender<ProgressMsg>)
-> Result<(), ()> {
loop {
- let mut buf = Vec::new();
+ let mut buf = vec!();
match reader.push_exact(&mut buf, READ_SIZE) {
Ok(_) => progress_chan.send(Payload(buf)),
Err(e) => match e.kind {
diff --git a/src/components/net/resource_task.rs b/src/components/net/resource_task.rs
index c7c152d8e4d..a88c5e6da3d 100644
--- a/src/components/net/resource_task.rs
+++ b/src/components/net/resource_task.rs
@@ -101,7 +101,7 @@ pub fn load_whole_resource(resource_task: &ResourceTask, url: Url)
resource_task.send(Load(url, start_chan));
let response = start_port.recv();
- let mut buf = Vec::new();
+ let mut buf = vec!();
loop {
match response.progress_port.recv() {
Payload(data) => buf.push_all(data.as_slice()),
diff --git a/src/components/script/dom/node.rs b/src/components/script/dom/node.rs
index 2dc39c7e50c..e9f41a8df44 100644
--- a/src/components/script/dom/node.rs
+++ b/src/components/script/dom/node.rs
@@ -1141,7 +1141,7 @@ impl Node {
// Step 3.
let addedNodes = match node {
- None => Vec::new(),
+ None => vec!(),
Some(ref node) => match node.type_id() {
DocumentFragmentNodeTypeId => node.children().collect(),
_ => vec!(node.clone()),
diff --git a/src/components/script/html/hubbub_html_parser.rs b/src/components/script/html/hubbub_html_parser.rs
index 927cefc284f..1254b11538c 100644
--- a/src/components/script/html/hubbub_html_parser.rs
+++ b/src/components/script/html/hubbub_html_parser.rs
@@ -106,7 +106,7 @@ spawned, collates them, and sends them to the given result channel.
*/
fn css_link_listener(to_parent: Sender<HtmlDiscoveryMessage>,
from_parent: Receiver<CSSMessage>) {
- let mut result_vec = Vec::new();
+ let mut result_vec = vec!();
loop {
match from_parent.recv_opt() {
@@ -129,7 +129,7 @@ fn css_link_listener(to_parent: Sender<HtmlDiscoveryMessage>,
fn js_script_listener(to_parent: Sender<HtmlDiscoveryMessage>,
from_parent: Receiver<JSMessage>,
resource_task: ResourceTask) {
- let mut result_vec = Vec::new();
+ let mut result_vec = vec!();
loop {
match from_parent.recv_opt() {
diff --git a/src/components/script/script_task.rs b/src/components/script/script_task.rs
index 19729d01909..051bc9b58d2 100644
--- a/src/components/script/script_task.rs
+++ b/src/components/script/script_task.rs
@@ -671,7 +671,7 @@ impl ScriptTask {
// Handle pending resize events.
// Gather them first to avoid a double mut borrow on self.
- let mut resizes = Vec::new();
+ let mut resizes = vec!();
{
let mut page_tree = self.page_tree.borrow_mut();
@@ -693,7 +693,7 @@ impl ScriptTask {
}
// Store new resizes, and gather all other events.
- let mut sequential = Vec::new();
+ let mut sequential = vec!();
// Receive at least one message so we don't spinloop.
let mut event = self.port.recv();
@@ -1133,7 +1133,7 @@ impl ScriptTask {
match page.get_nodes_under_mouse(&point) {
Some(node_address) => {
- let mut target_list: Vec<JS<Node>> = Vec::new();
+ let mut target_list: Vec<JS<Node>> = vec!();
let mut target_compare = false;
let mouse_over_targets = &mut *self.mouse_over_targets.borrow_mut();
diff --git a/src/components/style/media_queries.rs b/src/components/style/media_queries.rs
index c85fe93d151..5ead74f3914 100644
--- a/src/components/style/media_queries.rs
+++ b/src/components/style/media_queries.rs
@@ -58,7 +58,7 @@ pub fn parse_media_rule(rule: AtRule, parent_rules: &mut Vec<CSSRule>,
return
}
};
- let mut rules = Vec::new();
+ let mut rules = vec!();
for rule in ErrorLoggerIterator(parse_rule_list(block.move_iter())) {
match rule {
QualifiedRule(rule) => parse_style_rule(rule, &mut rules, namespaces, base_url),
@@ -79,7 +79,7 @@ pub fn parse_media_query_list(input: &[ComponentValue]) -> MediaQueryList {
if next.is_none() {
return MediaQueryList{ media_queries: vec!(MediaQuery{media_type: All}) }
}
- let mut queries = Vec::new();
+ let mut queries = vec!();
loop {
let mq = match next {
Some(&Ident(ref value)) => {
diff --git a/src/components/style/properties.rs.mako b/src/components/style/properties.rs.mako
index 1cf76d712be..8f3fe933daa 100644
--- a/src/components/style/properties.rs.mako
+++ b/src/components/style/properties.rs.mako
@@ -549,7 +549,7 @@ pub mod longhands {
},
_ => ()
}
- let mut content = Vec::new();
+ let mut content = vec!();
for component_value in input.skip_whitespace() {
match component_value {
&String(ref value)
@@ -716,7 +716,7 @@ pub mod longhands {
from_iter(input.skip_whitespace())
}
pub fn from_iter<'a>(mut iter: SkipWhitespaceIterator<'a>) -> Option<SpecifiedValue> {
- let mut result = Vec::new();
+ let mut result = vec!();
macro_rules! add(
($value: expr, $b: expr) => {
{
@@ -1349,8 +1349,8 @@ pub fn parse_style_attribute(input: &str, base_url: &Url) -> PropertyDeclaration
pub fn parse_property_declaration_list<I: Iterator<Node>>(input: I, base_url: &Url) -> PropertyDeclarationBlock {
- let mut important = Vec::new();
- let mut normal = Vec::new();
+ let mut important = vec!();
+ let mut normal = vec!();
for item in ErrorLoggerIterator(parse_declaration_list(input)) {
match item {
DeclAtRule(rule) => log_css_error(
diff --git a/src/components/style/selector_matching.rs b/src/components/style/selector_matching.rs
index 03cc5aadad1..c45d56acf40 100644
--- a/src/components/style/selector_matching.rs
+++ b/src/components/style/selector_matching.rs
@@ -960,7 +960,7 @@ mod tests {
selector: s.compound_selectors.clone(),
property: MatchedProperty {
specificity: s.specificity,
- declarations: Arc::new(Vec::new()),
+ declarations: Arc::new(vec!()),
source_order: i,
}
}
diff --git a/src/components/style/selectors.rs b/src/components/style/selectors.rs
index 830fa3ad125..88384a37d18 100644
--- a/src/components/style/selectors.rs
+++ b/src/components/style/selectors.rs
@@ -248,7 +248,7 @@ fn parse_simple_selectors(iter: &mut Iter, namespaces: &NamespaceMap)
let mut empty = true;
let mut simple_selectors = match parse_type_selector(iter, namespaces) {
InvalidTypeSelector => return None,
- NotATypeSelector => Vec::new(),
+ NotATypeSelector => vec!(),
TypeSelector(s) => { empty = false; s }
};
@@ -279,7 +279,7 @@ fn parse_type_selector(iter: &mut Iter, namespaces: &NamespaceMap)
InvalidQualifiedName => InvalidTypeSelector,
NotAQualifiedName => NotATypeSelector,
QualifiedName(namespace, local_name) => {
- let mut simple_selectors = Vec::new();
+ let mut simple_selectors = vec!();
match namespace {
SpecificNamespace(ns) => simple_selectors.push(NamespaceSelector(ns)),
AnyNamespace => (),
@@ -692,7 +692,7 @@ mod tests {
// https://github.com/mozilla/servo/issues/1723
assert!(parse("::before") == Some(vec!(Selector{
compound_selectors: Arc::new(CompoundSelector {
- simple_selectors: Vec::new(),
+ simple_selectors: vec!(),
next: None,
}),
pseudo_element: Some(Before),
@@ -700,7 +700,7 @@ mod tests {
})))
assert!(parse("div :after") == Some(vec!(Selector{
compound_selectors: Arc::new(CompoundSelector {
- simple_selectors: Vec::new(),
+ simple_selectors: vec!(),
next: Some((~CompoundSelector {
simple_selectors: vec!(LocalNameSelector("div".to_owned())),
next: None,
diff --git a/src/components/style/stylesheets.rs b/src/components/style/stylesheets.rs
index 97fdc437f32..6f4c97acb12 100644
--- a/src/components/style/stylesheets.rs
+++ b/src/components/style/stylesheets.rs
@@ -44,7 +44,7 @@ impl Stylesheet {
pub fn from_bytes_iter<I: Iterator<Vec<u8>>>(
mut input: I, base_url: Url, protocol_encoding_label: Option<&str>,
environment_encoding: Option<EncodingRef>) -> Stylesheet {
- let mut bytes = Vec::new();
+ let mut bytes = vec!();
// TODO: incremental decoding and tokinization/parsing
for chunk in input {
bytes.push_all(chunk.as_slice())
@@ -68,7 +68,7 @@ impl Stylesheet {
static STATE_BODY: uint = 4;
let mut state: uint = STATE_CHARSET;
- let mut rules = Vec::new();
+ let mut rules = vec!();
let mut namespaces = NamespaceMap::new();
for rule in ErrorLoggerIterator(parse_stylesheet_rules(tokenize(css))) {
diff --git a/src/components/util/cache.rs b/src/components/util/cache.rs
index 21bd3b01a6a..5b8bcf4e03b 100644
--- a/src/components/util/cache.rs
+++ b/src/components/util/cache.rs
@@ -127,7 +127,7 @@ pub struct LRUCache<K, V> {
impl<K: Clone + Eq, V: Clone> LRUCache<K,V> {
pub fn new(size: uint) -> LRUCache<K, V> {
LRUCache {
- entries: Vec::new(),
+ entries: vec!(),
cache_size: size,
}
}
diff --git a/src/components/util/time.rs b/src/components/util/time.rs
index 387aadae0bb..a9aa8d870ed 100644
--- a/src/components/util/time.rs
+++ b/src/components/util/time.rs
@@ -63,21 +63,21 @@ impl ProfilerCategory {
// enumeration of all ProfilerCategory types
fn empty_buckets() -> ProfilerBuckets {
let mut buckets = TreeMap::new();
- buckets.insert(CompositingCategory, Vec::new());
- buckets.insert(LayoutQueryCategory, Vec::new());
- buckets.insert(LayoutPerformCategory, Vec::new());
- buckets.insert(LayoutStyleRecalcCategory, Vec::new());
- buckets.insert(LayoutSelectorMatchCategory, Vec::new());
- buckets.insert(LayoutTreeBuilderCategory, Vec::new());
- buckets.insert(LayoutMainCategory, Vec::new());
- buckets.insert(LayoutParallelWarmupCategory, Vec::new());
- buckets.insert(LayoutShapingCategory, Vec::new());
- buckets.insert(LayoutDamagePropagateCategory, Vec::new());
- buckets.insert(LayoutDispListBuildCategory, Vec::new());
- buckets.insert(GfxRegenAvailableFontsCategory, Vec::new());
- buckets.insert(RenderingDrawingCategory, Vec::new());
- buckets.insert(RenderingPrepBuffCategory, Vec::new());
- buckets.insert(RenderingCategory, Vec::new());
+ buckets.insert(CompositingCategory, vec!());
+ buckets.insert(LayoutQueryCategory, vec!());
+ buckets.insert(LayoutPerformCategory, vec!());
+ buckets.insert(LayoutStyleRecalcCategory, vec!());
+ buckets.insert(LayoutSelectorMatchCategory, vec!());
+ buckets.insert(LayoutTreeBuilderCategory, vec!());
+ buckets.insert(LayoutMainCategory, vec!());
+ buckets.insert(LayoutParallelWarmupCategory, vec!());
+ buckets.insert(LayoutShapingCategory, vec!());
+ buckets.insert(LayoutDamagePropagateCategory, vec!());
+ buckets.insert(LayoutDispListBuildCategory, vec!());
+ buckets.insert(GfxRegenAvailableFontsCategory, vec!());
+ buckets.insert(RenderingDrawingCategory, vec!());
+ buckets.insert(RenderingPrepBuffCategory, vec!());
+ buckets.insert(RenderingCategory, vec!());
buckets
}
diff --git a/src/components/util/url.rs b/src/components/util/url.rs
index 757a2acf605..9d673bbfb57 100644
--- a/src/components/util/url.rs
+++ b/src/components/util/url.rs
@@ -4,7 +4,6 @@
use collections::HashMap;
use std::os;
-use std::vec::Vec;
use std_url;
use std_url::Url;
@@ -39,7 +38,7 @@ pub fn parse_url(str_url: &str, base_url: Option<std_url::Url>) -> std_url::Url
debug!("parse_url: base_url: {:?}", base_url);
let mut new_url = base_url.clone();
- new_url.query = Vec::new();
+ new_url.query = vec!();
new_url.fragment = None;
if str_url.starts_with("//") {