diff options
author | Brendan Zabarauskas <bjzaba@yahoo.com.au> | 2014-05-05 16:59:12 -0700 |
---|---|---|
committer | Brendan Zabarauskas <bjzaba@yahoo.com.au> | 2014-05-05 16:59:12 -0700 |
commit | 42bf406411065f958f9ef7943f951c2c905a6052 (patch) | |
tree | d77e389866cc278de5bc3bdc4b6a1bbf6f0c47ed /src/components/main/layout/text.rs | |
parent | b24cc8072b4d74fe62d3a6e1f10c6bb701ef11bb (diff) | |
download | servo-42bf406411065f958f9ef7943f951c2c905a6052.tar.gz servo-42bf406411065f958f9ef7943f951c2c905a6052.zip |
Replace most of the SmallVec0 usages with std::vec::Vec
We can't replace the ones in the `style` crate because some functions expect generic `SmallVec`s.
Diffstat (limited to 'src/components/main/layout/text.rs')
-rw-r--r-- | src/components/main/layout/text.rs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/components/main/layout/text.rs b/src/components/main/layout/text.rs index 2b048bf60c8..3757bef9d80 100644 --- a/src/components/main/layout/text.rs +++ b/src/components/main/layout/text.rs @@ -14,7 +14,6 @@ use gfx::text::text_run::TextRun; use gfx::text::util::{CompressWhitespaceNewline, transform_text, CompressNone}; use servo_util::geometry::Au; use servo_util::range::Range; -use servo_util::smallvec::{SmallVec, SmallVec0}; use std::mem; use style::ComputedValues; use style::computed_values::{font_family, line_height, white_space}; @@ -54,7 +53,7 @@ impl TextRunScanner { } = mem::replace(&mut flow.as_inline().boxes, InlineBoxes::new()); let mut last_whitespace = true; - let mut new_boxes = SmallVec0::new(); + let mut new_boxes = Vec::new(); for box_i in range(0, old_boxes.len()) { debug!("TextRunScanner: considering box: {:u}", box_i); if box_i > 0 && !can_coalesce_text_nodes(old_boxes.as_slice(), box_i - 1, box_i) { @@ -97,7 +96,7 @@ impl TextRunScanner { pub fn flush_clump_to_list(&mut self, font_context: &mut FontContext, in_boxes: &[Box], - out_boxes: &mut SmallVec0<Box>, + out_boxes: &mut Vec<Box>, last_whitespace: bool) -> bool { assert!(self.clump.length() > 0); |