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

Use util::str::str_join in more places

Browse source 
Instead of intermediate allocations of `Vec`s, we should utilize
`str_join` which operates on iterators
This commit is contained in:
Corey Farwell 2015-09-28 19:57:06 -04:00
parent 2857e547be
commit f14f09e886
4 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
components/script/dom/cssstyledeclaration.rs
View file

@ -15,11 +15,10 @@ use selectors::parser::PseudoElement;
use std::ascii::AsciiExt; use std::ascii::AsciiExt;
use std::borrow::ToOwned; use std::borrow::ToOwned;
use std::cell::Ref; use std::cell::Ref;
use std::slice::SliceConcatExt;
use string_cache::Atom; use string_cache::Atom;
use style::properties::PropertyDeclaration; use style::properties::PropertyDeclaration;
use style::properties::{is_supported_property, longhands_from_shorthand, parse_one_declaration}; use style::properties::{is_supported_property, longhands_from_shorthand, parse_one_declaration};
use util::str::DOMString; use util::str::{DOMString, str_join};
// http://dev.w3.org/csswg/cssom/#the-cssstyledeclaration-interface // http://dev.w3.org/csswg/cssom/#the-cssstyledeclaration-interface
#[dom_struct] #[dom_struct]
@ -50,8 +49,8 @@ macro_rules! css_properties(
); );
fn serialize_list(list: &[Ref<PropertyDeclaration>]) -> DOMString { fn serialize_list(list: &[Ref<PropertyDeclaration>]) -> DOMString {
let strings: Vec<_> = list.iter().map(|d| d.value()).collect(); let str_iter = list.iter().map(|d| d.value());
strings.join(" ") str_join(str_iter, " ")
} }
impl CSSStyleDeclaration { impl CSSStyleDeclaration {

4
components/script/dom/document.rs
View file

@ -98,7 +98,7 @@ use std::sync::mpsc::channel;
use string_cache::{Atom, QualName}; use string_cache::{Atom, QualName};
use time; use time;
use url::Url; use url::Url;
use util::str::{DOMString, split_html_space_chars}; use util::str::{DOMString, split_html_space_chars, str_join};
#[derive(JSTraceable, PartialEq, HeapSizeOf)] #[derive(JSTraceable, PartialEq, HeapSizeOf)]
pub enum IsHTMLDocument { pub enum IsHTMLDocument {
@ -1443,7 +1443,7 @@ impl DocumentMethods for Document {
Some(ref title) => { Some(ref title) => {
// Steps 3-4. // Steps 3-4.
let value = Node::collect_text_contents(title.r().children()); let value = Node::collect_text_contents(title.r().children());
split_html_space_chars(&value).collect::<Vec<_>>().join(" ") str_join(split_html_space_chars(&value), " ")
}, },
} }
} }

5
components/script/dom/htmloptionelement.rs
View file

@ -18,7 +18,7 @@ use dom::htmlelement::{HTMLElement, HTMLElementTypeId};
use dom::node::{Node, NodeTypeId}; use dom::node::{Node, NodeTypeId};
use dom::virtualmethods::VirtualMethods; use dom::virtualmethods::VirtualMethods;
use std::cell::Cell; use std::cell::Cell;
use util::str::{DOMString, split_html_space_chars}; use util::str::{DOMString, split_html_space_chars, str_join};
#[dom_struct] #[dom_struct]
pub struct HTMLOptionElement { pub struct HTMLOptionElement {
@ -93,8 +93,7 @@ impl HTMLOptionElementMethods for HTMLOptionElement {
let node = NodeCast::from_ref(self); let node = NodeCast::from_ref(self);
let mut content = String::new(); let mut content = String::new();
collect_text(&node, &mut content); collect_text(&node, &mut content);
let v: Vec<&str> = split_html_space_chars(&content).collect(); str_join(split_html_space_chars(&content), " ")
v.join(" ")
} }
// https://www.whatwg.org/html/#dom-option-text // https://www.whatwg.org/html/#dom-option-text

1
components/script/lib.rs
View file

@ -24,7 +24,6 @@
#![feature(str_utf16)] #![feature(str_utf16)]
#![feature(unicode)] #![feature(unicode)]
#![feature(vec_push_all)] #![feature(vec_push_all)]
#![feature(slice_concat_ext)]
#![deny(unsafe_code)] #![deny(unsafe_code)]
#![allow(non_snake_case)] #![allow(non_snake_case)]