Skip to content

Commit

Permalink
auto merge of #2347 : Ms2ger/servo/vec, r=jdm
Browse files Browse the repository at this point in the history
  • Loading branch information
bors-servo committed May 6, 2014
2 parents 03e0f91 + d89c16f commit c013d2a
Show file tree
Hide file tree
Showing 10 changed files with 120 additions and 114 deletions.
7 changes: 3 additions & 4 deletions src/components/gfx/font_list.rs
View file
Expand Up @@ -18,7 +18,7 @@ pub type FontFamilyMap = HashMap<~str, FontFamily>;
trait FontListHandleMethods {
fn get_available_families(&self, fctx: &FontContextHandle) -> FontFamilyMap;
fn load_variations_for_family(&self, family: &mut FontFamily);
fn get_last_resort_font_families() -> ~[~str];
fn get_last_resort_font_families() -> Vec<~str>;
}

/// The platform-independent font list abstraction.
Expand Down Expand Up @@ -75,9 +75,8 @@ impl FontList {
}
}

pub fn get_last_resort_font_families() -> ~[~str] {
let last_resort = FontListHandle::get_last_resort_font_families();
last_resort
pub fn get_last_resort_font_families() -> Vec<~str> {
FontListHandle::get_last_resort_font_families()
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/components/gfx/platform/android/font_list.rs
View file
Expand Up @@ -129,8 +129,8 @@ impl FontListHandle {
}
}

pub fn get_last_resort_font_families() -> ~[~str] {
~["Roboto".to_owned()]
pub fn get_last_resort_font_families() -> Vec<~str> {
vec!("Roboto".to_owned())
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/components/gfx/platform/linux/font_list.rs
View file
Expand Up @@ -131,8 +131,8 @@ impl FontListHandle {
}
}

pub fn get_last_resort_font_families() -> ~[~str] {
~["Arial".to_owned()]
pub fn get_last_resort_font_families() -> Vec<~str> {
vec!("Arial".to_owned())
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/components/gfx/platform/macos/font_list.rs
View file
Expand Up @@ -58,7 +58,7 @@ impl FontListHandle {
}
}

pub fn get_last_resort_font_families() -> ~[~str] {
~["Arial Unicode MS".to_owned(),"Arial".to_owned()]
pub fn get_last_resort_font_families() -> Vec<~str> {
vec!("Arial Unicode MS".to_owned(), "Arial".to_owned())
}
}
108 changes: 58 additions & 50 deletions src/components/gfx/text/util.rs
View file
Expand Up @@ -138,49 +138,53 @@ fn test_true_type_tag() {

#[test]
fn test_transform_compress_none() {

let test_strs : ~[~str] = ~[" foo bar".to_owned(),
"foo bar ".to_owned(),
"foo\n bar".to_owned(),
"foo \nbar".to_owned(),
" foo bar \nbaz".to_owned(),
"foo bar baz".to_owned(),
"foobarbaz\n\n".to_owned()];
let test_strs = vec!(
" foo bar",
"foo bar ",
"foo\n bar",
"foo \nbar",
" foo bar \nbaz",
"foo bar baz",
"foobarbaz\n\n"
);
let mode = CompressNone;

for i in range(0, test_strs.len()) {
for test in test_strs.iter() {
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])
let (trimmed_str, _out) = transform_text(*test, mode, true, &mut new_line_pos);
assert_eq!(trimmed_str.as_slice(), *test)
}
}

#[test]
fn test_transform_discard_newline() {

let test_strs : ~[~str] = ~[" foo bar".to_owned(),
"foo bar ".to_owned(),
"foo\n bar".to_owned(),
"foo \nbar".to_owned(),
" foo bar \nbaz".to_owned(),
"foo bar baz".to_owned(),
"foobarbaz\n\n".to_owned()];

let oracle_strs : ~[~str] = ~[" foo bar".to_owned(),
"foo bar ".to_owned(),
"foo bar".to_owned(),
"foo bar".to_owned(),
" foo bar baz".to_owned(),
"foo bar baz".to_owned(),
"foobarbaz".to_owned()];
let test_strs = vec!(
" foo bar",
"foo bar ",
"foo\n bar",
"foo \nbar",
" foo bar \nbaz",
"foo bar baz",
"foobarbaz\n\n"
);

let oracle_strs = vec!(
" foo bar",
"foo bar ",
"foo bar",
"foo bar",
" foo bar baz",
"foo bar baz",
"foobarbaz"
);

assert_eq!(test_strs.len(), oracle_strs.len());
let mode = DiscardNewline;

for i in range(0, test_strs.len()) {
for (test, oracle) in test_strs.iter().zip(oracle_strs.iter()) {
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])
let (trimmed_str, _out) = transform_text(*test, mode, true, &mut new_line_pos);
assert_eq!(trimmed_str.as_slice(), *oracle)
}
}

Expand Down Expand Up @@ -244,30 +248,34 @@ fn test_transform_compress_whitespace_newline() {

#[test]
fn test_transform_compress_whitespace_newline_no_incoming() {
let test_strs : ~[~str] = ~[" foo bar".to_owned(),
"\nfoo bar".to_owned(),
"foo bar ".to_owned(),
"foo\n bar".to_owned(),
"foo \nbar".to_owned(),
" foo bar \nbaz".to_owned(),
"foo bar baz".to_owned(),
"foobarbaz\n\n".to_owned()];

let oracle_strs : ~[~str] = ~[" foo bar".to_owned(),
" foo bar".to_owned(),
"foo bar ".to_owned(),
"foo bar".to_owned(),
"foo bar".to_owned(),
" foo bar baz".to_owned(),
"foo bar baz".to_owned(),
"foobarbaz ".to_owned()];
let test_strs = vec!(
" foo bar",
"\nfoo bar",
"foo bar ",
"foo\n bar",
"foo \nbar",
" foo bar \nbaz",
"foo bar baz",
"foobarbaz\n\n"
);

let oracle_strs = vec!(
" foo bar",
" foo bar",
"foo bar ",
"foo bar",
"foo bar",
" foo bar baz",
"foo bar baz",
"foobarbaz "
);

assert_eq!(test_strs.len(), oracle_strs.len());
let mode = CompressWhitespaceNewline;

for i in range(0, test_strs.len()) {
for (test, oracle) in test_strs.iter().zip(oracle_strs.iter()) {
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])
let (trimmed_str, _out) = transform_text(*test, mode, false, &mut new_line_pos);
assert_eq!(trimmed_str.as_slice(), *oracle)
}
}
2 changes: 1 addition & 1 deletion src/components/main/compositing/compositor_task.rs
View file
Expand Up @@ -81,7 +81,7 @@ impl RenderListener for CompositorChan {

fn initialize_layers_for_pipeline(&self,
pipeline_id: PipelineId,
metadata: ~[LayerMetadata],
metadata: Vec<LayerMetadata>,
epoch: Epoch) {
// FIXME(#2004, pcwalton): This assumes that the first layer determines the page size, and
// that all other layers are immediate children of it. This is sufficient to handle
Expand Down
2 changes: 1 addition & 1 deletion src/components/msg/compositor_msg.rs
View file
Expand Up @@ -126,7 +126,7 @@ pub trait RenderListener {
/// creating and/or destroying render layers as necessary.
fn initialize_layers_for_pipeline(&self,
pipeline_id: PipelineId,
metadata: ~[LayerMetadata],
metadata: Vec<LayerMetadata>,
epoch: Epoch);

fn set_layer_clip_rect(&self,
Expand Down
12 changes: 6 additions & 6 deletions src/components/net/resource_task.rs
View file
Expand Up @@ -126,15 +126,15 @@ type LoaderTaskFactory = extern "Rust" fn() -> LoaderTask;

/// Create a ResourceTask with the default loaders
pub fn ResourceTask() -> ResourceTask {
let loaders = ~[
let loaders = vec!(
("file".to_owned(), file_loader::factory),
("http".to_owned(), http_loader::factory),
("data".to_owned(), data_loader::factory),
];
);
create_resource_task_with_loaders(loaders)
}

fn create_resource_task_with_loaders(loaders: ~[(~str, LoaderTaskFactory)]) -> ResourceTask {
fn create_resource_task_with_loaders(loaders: Vec<(~str, LoaderTaskFactory)>) -> ResourceTask {
let (setup_chan, setup_port) = channel();
let builder = task::task().named("ResourceManager");
builder.spawn(proc() {
Expand All @@ -148,12 +148,12 @@ fn create_resource_task_with_loaders(loaders: ~[(~str, LoaderTaskFactory)]) -> R
struct ResourceManager {
from_client: Receiver<ControlMsg>,
/// Per-scheme resource loaders
loaders: ~[(~str, LoaderTaskFactory)],
loaders: Vec<(~str, LoaderTaskFactory)>,
}


fn ResourceManager(from_client: Receiver<ControlMsg>,
loaders: ~[(~str, LoaderTaskFactory)]) -> ResourceManager {
loaders: Vec<(~str, LoaderTaskFactory)>) -> ResourceManager {
ResourceManager {
from_client : from_client,
loaders : loaders,
Expand Down Expand Up @@ -236,7 +236,7 @@ fn snicklefritz_loader_factory() -> LoaderTask {

#[test]
fn should_delegate_to_scheme_loader() {
let loader_factories = ~[("snicklefritz".to_owned(), snicklefritz_loader_factory)];
let loader_factories = vec!(("snicklefritz".to_owned(), snicklefritz_loader_factory));
let resource_task = create_resource_task_with_loaders(loader_factories);
let (start_chan, start) = channel();
resource_task.send(Load(FromStr::from_str("snicklefritz://heya").unwrap(), start_chan));
Expand Down

0 comments on commit c013d2a

Please sign in to comment.