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

auto merge of #4485 : servo/servo/into_string, r=Ms2ger

Browse source 
`str::to_string()` goes through a `Formatter`, `str::into_string()` is a direct copy and is apparently 5× faster.

This is a rebase of the boring and bitrot-prone parts of #4366.
This commit is contained in:
bors-servo 2014-12-27 06:51:44 -07:00
commit 9857ea26cb
56 changed files with 332 additions and 332 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/gfx/font.rs
View file

@ -160,7 +160,7 @@ impl Font {
let glyphs = Arc::new(glyphs); let glyphs = Arc::new(glyphs);
self.shape_cache.insert(ShapeCacheEntry { self.shape_cache.insert(ShapeCacheEntry {
text: text.to_string(), text: text.into_string(),
options: *options, options: *options,
}, glyphs.clone()); }, glyphs.clone());
glyphs glyphs

4
components/gfx/font_cache_task.rs
View file

@ -181,7 +181,7 @@ impl FontCache {
// TODO(Issue #188): look up localized font family names if canonical name not found // TODO(Issue #188): look up localized font family names if canonical name not found
// look up canonical name // look up canonical name
if self.local_families.contains_key(family_name) { if self.local_families.contains_key(family_name) {
debug!("FontList: Found font family with name={:s}", family_name.to_string()); debug!("FontList: Found font family with name={:s}", family_name.as_slice());
let s = &mut self.local_families[*family_name]; let s = &mut self.local_families[*family_name];
if s.templates.len() == 0 { if s.templates.len() == 0 {
@ -199,7 +199,7 @@ impl FontCache {
None None
} else { } else {
debug!("FontList: Couldn't find font family with name={:s}", family_name.to_string()); debug!("FontList: Couldn't find font family with name={:s}", family_name.as_slice());
None None
} }
} }

6
components/gfx/font_context.rs
View file

@ -167,7 +167,7 @@ impl FontContext {
if !cache_hit { if !cache_hit {
let font_template = self.font_cache_task.get_font_template(family.name() let font_template = self.font_cache_task.get_font_template(family.name()
.to_string(), .into_string(),
desc.clone()); desc.clone());
match font_template { match font_template {
Some(font_template) => { Some(font_template) => {
@ -177,14 +177,14 @@ impl FontContext {
style.font_variant); style.font_variant);
let layout_font = Rc::new(RefCell::new(layout_font)); let layout_font = Rc::new(RefCell::new(layout_font));
self.layout_font_cache.push(LayoutFontCacheEntry { self.layout_font_cache.push(LayoutFontCacheEntry {
family: family.name().to_string(), family: family.name().into_string(),
font: Some(layout_font.clone()), font: Some(layout_font.clone()),
}); });
fonts.push(layout_font); fonts.push(layout_font);
} }
None => { None => {
self.layout_font_cache.push(LayoutFontCacheEntry { self.layout_font_cache.push(LayoutFontCacheEntry {
family: family.name().to_string(), family: family.name().into_string(),
font: None, font: None,
}); });
} }

2
components/gfx/font_template.rs
View file

@ -68,7 +68,7 @@ impl FontTemplate {
}; };
FontTemplate { FontTemplate {
identifier: identifier.to_string(), identifier: identifier.into_string(),
descriptor: None, descriptor: None,
weak_ref: maybe_weak_ref, weak_ref: maybe_weak_ref,
strong_ref: maybe_strong_ref, strong_ref: maybe_strong_ref,

8
components/gfx/platform/freetype/font_list.rs
View file

@ -127,13 +127,13 @@ pub fn get_system_default_family(generic_name: &str) -> Option<String> {
#[cfg(target_os="linux")] #[cfg(target_os="linux")]
pub fn get_last_resort_font_families() -> Vec<String> { pub fn get_last_resort_font_families() -> Vec<String> {
vec!( vec!(
"Fira Sans".to_string(), "Fira Sans".into_string(),
"DejaVu Sans".to_string(), "DejaVu Sans".into_string(),
"Arial".to_string() "Arial".into_string()
) )
} }
#[cfg(target_os="android")] #[cfg(target_os="android")]
pub fn get_last_resort_font_families() -> Vec<String> { pub fn get_last_resort_font_families() -> Vec<String> {
vec!("Roboto".to_string()) vec!("Roboto".into_string())
} }

2
components/gfx/platform/freetype/font_template.rs
View file

@ -29,7 +29,7 @@ impl FontTemplateData {
FontTemplateData { FontTemplateData {
bytes: bytes, bytes: bytes,
identifier: identifier.to_string(), identifier: identifier.into_string(),
} }
} }
} }

2
components/gfx/platform/macos/font_list.rs
View file

@ -42,5 +42,5 @@ pub fn get_system_default_family(_generic_name: &str) -> Option<String> {
} }
pub fn get_last_resort_font_families() -> Vec<String> { pub fn get_last_resort_font_families() -> Vec<String> {
vec!("Arial Unicode MS".to_string(), "Arial".to_string()) vec!("Arial Unicode MS".into_string(), "Arial".into_string())
} }

2
components/gfx/platform/macos/font_template.rs
View file

@ -34,7 +34,7 @@ impl FontTemplateData {
FontTemplateData { FontTemplateData {
ctfont: ctfont, ctfont: ctfont,
identifier: identifier.to_string(), identifier: identifier.into_string(),
} }
} }
} }

56
components/gfx/text/util.rs
View file

@ -199,21 +199,21 @@ fn test_transform_discard_newline() {
/* FIXME: Fix and re-enable /* FIXME: Fix and re-enable
#[test] #[test]
fn test_transform_compress_whitespace() { fn test_transform_compress_whitespace() {
let test_strs : ~[String] = ~[" foo bar".to_string(), let test_strs : ~[String] = ~[" foo bar".into_string(),
"foo bar ".to_string(), "foo bar ".into_string(),
"foo\n bar".to_string(), "foo\n bar".into_string(),
"foo \nbar".to_string(), "foo \nbar".into_string(),
" foo bar \nbaz".to_string(), " foo bar \nbaz".into_string(),
"foo bar baz".to_string(), "foo bar baz".into_string(),
"foobarbaz\n\n".to_string()]; "foobarbaz\n\n".into_string()];
let oracle_strs : ~[String] = ~[" foo bar".to_string(), let oracle_strs : ~[String] = ~[" foo bar".into_string(),
"foo bar ".to_string(), "foo bar ".into_string(),
"foo\n bar".to_string(), "foo\n bar".into_string(),
"foo \nbar".to_string(), "foo \nbar".into_string(),
" foo bar \nbaz".to_string(), " foo bar \nbaz".into_string(),
"foo bar baz".to_string(), "foo bar baz".into_string(),
"foobarbaz\n\n".to_string()]; "foobarbaz\n\n".into_string()];
assert_eq!(test_strs.len(), oracle_strs.len()); assert_eq!(test_strs.len(), oracle_strs.len());
let mode = CompressWhitespace; let mode = CompressWhitespace;
@ -227,21 +227,21 @@ fn test_transform_compress_whitespace() {
#[test] #[test]
fn test_transform_compress_whitespace_newline() { fn test_transform_compress_whitespace_newline() {
let test_strs : ~[String] = ~[" foo bar".to_string(), let test_strs : ~[String] = ~[" foo bar".into_string(),
"foo bar ".to_string(), "foo bar ".into_string(),
"foo\n bar".to_string(), "foo\n bar".into_string(),
"foo \nbar".to_string(), "foo \nbar".into_string(),
" foo bar \nbaz".to_string(), " foo bar \nbaz".into_string(),
"foo bar baz".to_string(), "foo bar baz".into_string(),
"foobarbaz\n\n".to_string()]; "foobarbaz\n\n".into_string()];
let oracle_strs : ~[String] = ~["foo bar".to_string(), let oracle_strs : ~[String] = ~["foo bar".into_string(),
"foo bar ".to_string(), "foo bar ".into_string(),
"foo bar".to_string(), "foo bar".into_string(),
"foo bar".to_string(), "foo bar".into_string(),
" foo bar baz".to_string(), " foo bar baz".into_string(),
"foo bar baz".to_string(), "foo bar baz".into_string(),
"foobarbaz ".to_string()]; "foobarbaz ".into_string()];
assert_eq!(test_strs.len(), oracle_strs.len()); assert_eq!(test_strs.len(), oracle_strs.len());
let mode = CompressionMode::CompressWhitespaceNewline; let mode = CompressionMode::CompressWhitespaceNewline;

6
components/layout/construct.rs
View file

@ -451,7 +451,7 @@ impl<'a> FlowConstructor<'a> {
// Add whitespace results. They will be stripped out later on when // Add whitespace results. They will be stripped out later on when
// between block elements, and retained when between inline elements. // between block elements, and retained when between inline elements.
let fragment_info = let fragment_info =
SpecificFragmentInfo::UnscannedText(UnscannedTextFragmentInfo::from_text(" ".to_string())); SpecificFragmentInfo::UnscannedText(UnscannedTextFragmentInfo::from_text(" ".into_string()));
let fragment = Fragment::from_opaque_node_and_style(whitespace_node, let fragment = Fragment::from_opaque_node_and_style(whitespace_node,
whitespace_style, whitespace_style,
whitespace_damage, whitespace_damage,
@ -648,7 +648,7 @@ impl<'a> FlowConstructor<'a> {
whitespace_damage)) => { whitespace_damage)) => {
// Instantiate the whitespace fragment. // Instantiate the whitespace fragment.
let fragment_info = SpecificFragmentInfo::UnscannedText(UnscannedTextFragmentInfo::from_text( let fragment_info = SpecificFragmentInfo::UnscannedText(UnscannedTextFragmentInfo::from_text(
" ".to_string())); " ".into_string()));
let fragment = Fragment::from_opaque_node_and_style(whitespace_node, let fragment = Fragment::from_opaque_node_and_style(whitespace_node,
whitespace_style, whitespace_style,
whitespace_damage, whitespace_damage,
@ -959,7 +959,7 @@ impl<'a> FlowConstructor<'a> {
.list_style_type) { .list_style_type) {
None => None, None => None,
Some(text) => { Some(text) => {
let text = text.to_string(); let text = text.into_string();
let mut unscanned_marker_fragments = DList::new(); let mut unscanned_marker_fragments = DList::new();
unscanned_marker_fragments.push_back(Fragment::new_from_specific_info( unscanned_marker_fragments.push_back(Fragment::new_from_specific_info(
node, node,

2
components/layout/css/matching.rs
View file

@ -241,7 +241,7 @@ impl StyleSharingCandidate {
parent_style: parent_style, parent_style: parent_style,
local_name: element.get_local_name().clone(), local_name: element.get_local_name().clone(),
class: element.get_attr(&ns!(""), &atom!("class")) class: element.get_attr(&ns!(""), &atom!("class"))
.map(|string| string.to_string()), .map(|string| string.into_string()),
link: element.get_link().is_some(), link: element.get_link().is_some(),
namespace: (*element.get_namespace()).clone(), namespace: (*element.get_namespace()).clone(),
common_style_affecting_attributes: common_style_affecting_attributes:

2
components/layout/layout_debug.rs
View file

@ -104,7 +104,7 @@ pub fn begin_trace(flow_root: FlowRef) {
let flow_trace = json::encode(&flow::base(flow_root.deref())); let flow_trace = json::encode(&flow::base(flow_root.deref()));
let state = State { let state = State {
scope_stack: vec![box ScopeData::new("root".to_string(), flow_trace)], scope_stack: vec![box ScopeData::new("root".into_string(), flow_trace)],
flow_root: flow_root, flow_root: flow_root,
}; };
state_key.replace(Some(RefCell::new(state))); state_key.replace(Some(RefCell::new(state)));

2
components/layout/layout_task.rs
View file

@ -493,7 +493,7 @@ impl LayoutTask {
// GWTODO: Need to handle unloading web fonts (when we handle unloading stylesheets!) // GWTODO: Need to handle unloading web fonts (when we handle unloading stylesheets!)
let mut rw_data = self.lock_rw_data(possibly_locked_rw_data); let mut rw_data = self.lock_rw_data(possibly_locked_rw_data);
iter_font_face_rules(&sheet, &rw_data.stylist.device, |family, src| { iter_font_face_rules(&sheet, &rw_data.stylist.device, |family, src| {
self.font_cache_task.add_web_font(family.to_string(), (*src).clone()); self.font_cache_task.add_web_font(family.into_string(), (*src).clone());
}); });
rw_data.stylist.add_stylesheet(sheet); rw_data.stylist.add_stylesheet(sheet);
LayoutTask::return_rw_data(possibly_locked_rw_data, rw_data); LayoutTask::return_rw_data(possibly_locked_rw_data, rw_data);

6
components/layout/wrapper.rs
View file

@ -187,7 +187,7 @@ impl<'ln> TLayoutNode for LayoutNode<'ln> {
fn text(&self) -> String { fn text(&self) -> String {
unsafe { unsafe {
if let Some(text) = TextCast::to_js(self.get_jsmanaged()) { if let Some(text) = TextCast::to_js(self.get_jsmanaged()) {
(*text.unsafe_get()).characterdata().data_for_layout().to_string() (*text.unsafe_get()).characterdata().data_for_layout().into_string()
} else if let Some(input) = HTMLInputElementCast::to_js(self.get_jsmanaged()) { } else if let Some(input) = HTMLInputElementCast::to_js(self.get_jsmanaged()) {
input.get_value_for_layout() input.get_value_for_layout()
} else if let Some(area) = HTMLTextAreaElementCast::to_js(self.get_jsmanaged()) { } else if let Some(area) = HTMLTextAreaElementCast::to_js(self.get_jsmanaged()) {
@ -634,10 +634,10 @@ fn get_content(content_list: &content::T) -> String {
let iter = &mut value.clone().into_iter().peekable(); let iter = &mut value.clone().into_iter().peekable();
match iter.next() { match iter.next() {
Some(content::StringContent(content)) => content, Some(content::StringContent(content)) => content,
_ => "".to_string(), _ => "".into_string(),
} }
} }
_ => "".to_string(), _ => "".into_string(),
} }
} }

2
components/script/dom/activation.rs
View file

@ -44,7 +44,7 @@ pub trait Activatable : Copy {
// https://html.spec.whatwg.org/multipage/webappapis.html#fire-a-synthetic-mouse-event // https://html.spec.whatwg.org/multipage/webappapis.html#fire-a-synthetic-mouse-event
let win = window_from_node(*element).root(); let win = window_from_node(*element).root();
let target: JSRef<EventTarget> = EventTargetCast::from_ref(*element); let target: JSRef<EventTarget> = EventTargetCast::from_ref(*element);
let mouse = MouseEvent::new(*win, "click".to_string(), false, false, Some(*win), 1, let mouse = MouseEvent::new(*win, "click".into_string(), false, false, Some(*win), 1,
0, 0, 0, 0, ctrlKey, shiftKey, altKey, metaKey, 0, 0, 0, 0, ctrlKey, shiftKey, altKey, metaKey,
0, None).root(); 0, None).root();
let event: JSRef<Event> = EventCast::from_ref(*mouse); let event: JSRef<Event> = EventCast::from_ref(*mouse);

10
components/script/dom/attr.rs
View file

@ -143,11 +143,11 @@ impl Attr {
impl<'a> AttrMethods for JSRef<'a, Attr> { impl<'a> AttrMethods for JSRef<'a, Attr> {
fn LocalName(self) -> DOMString { fn LocalName(self) -> DOMString {
self.local_name().as_slice().to_string() self.local_name().as_slice().into_string()
} }
fn Value(self) -> DOMString { fn Value(self) -> DOMString {
self.value().as_slice().to_string() self.value().as_slice().into_string()
} }
fn SetValue(self, value: DOMString) { fn SetValue(self, value: DOMString) {
@ -180,14 +180,14 @@ impl<'a> AttrMethods for JSRef<'a, Attr> {
} }
fn Name(self) -> DOMString { fn Name(self) -> DOMString {
self.name.as_slice().to_string() self.name.as_slice().into_string()
} }
fn GetNamespaceURI(self) -> Option<DOMString> { fn GetNamespaceURI(self) -> Option<DOMString> {
let Namespace(ref atom) = self.namespace; let Namespace(ref atom) = self.namespace;
match atom.as_slice() { match atom.as_slice() {
"" => None, "" => None,
url => Some(url.to_string()), url => Some(url.into_string()),
} }
} }
@ -242,7 +242,7 @@ impl<'a> AttrHelpers<'a> for JSRef<'a, Attr> {
fn summarize(self) -> AttrInfo { fn summarize(self) -> AttrInfo {
let Namespace(ref ns) = self.namespace; let Namespace(ref ns) = self.namespace;
AttrInfo { AttrInfo {
namespace: ns.as_slice().to_string(), namespace: ns.as_slice().into_string(),
name: self.Name(), name: self.Name(),
value: self.Value(), value: self.Value(),
} }

4
components/script/dom/bindings/codegen/CodegenRust.py
View file

@ -679,7 +679,7 @@ def getJSToNativeConversionTemplate(type, descriptorProvider, failureCode=None,
default = "None" default = "None"
else: else:
assert defaultValue.type.tag() == IDLType.Tags.domstring assert defaultValue.type.tag() == IDLType.Tags.domstring
value = "str::from_utf8(data).unwrap().to_string()" value = "str::from_utf8(data).unwrap().into_string()"
if type.nullable(): if type.nullable():
value = "Some(%s)" % value value = "Some(%s)" % value
@ -2778,7 +2778,7 @@ pub const strings: &'static [&'static str] = &[
impl ToJSValConvertible for super::%s { impl ToJSValConvertible for super::%s {
fn to_jsval(&self, cx: *mut JSContext) -> JSVal { fn to_jsval(&self, cx: *mut JSContext) -> JSVal {
strings[*self as uint].to_string().to_jsval(cx) strings[*self as uint].into_string().to_jsval(cx)
} }
} }
""" % (",\n ".join(['"%s"' % val for val in enum.values()]), enum.identifier.name) """ % (",\n ".join(['"%s"' % val for val in enum.values()]), enum.identifier.name)

2
components/script/dom/bindings/conversions.rs
View file

@ -284,7 +284,7 @@ pub fn jsid_to_str(cx: *mut JSContext, id: jsid) -> DOMString {
impl FromJSValConvertible<StringificationBehavior> for DOMString { impl FromJSValConvertible<StringificationBehavior> for DOMString {
fn from_jsval(cx: *mut JSContext, value: JSVal, nullBehavior: StringificationBehavior) -> Result<DOMString, ()> { fn from_jsval(cx: *mut JSContext, value: JSVal, nullBehavior: StringificationBehavior) -> Result<DOMString, ()> {
if nullBehavior == StringificationBehavior::Empty && value.is_null() { if nullBehavior == StringificationBehavior::Empty && value.is_null() {
Ok("".to_string()) Ok("".into_string())
} else { } else {
let jsstr = unsafe { JS_ValueToString(cx, value) }; let jsstr = unsafe { JS_ValueToString(cx, value) };
if jsstr.is_null() { if jsstr.is_null() {

2
components/script/dom/bindings/str.rs
View file

@ -154,6 +154,6 @@ impl Hash for ByteString {
impl FromStr for ByteString { impl FromStr for ByteString {
fn from_str(s: &str) -> Option<ByteString> { fn from_str(s: &str) -> Option<ByteString> {
Some(ByteString::new(s.to_string().into_bytes())) Some(ByteString::new(s.into_string().into_bytes()))
} }
} }

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

@ -36,7 +36,7 @@ impl Blob {
reflector_: Reflector::new(), reflector_: Reflector::new(),
type_: type_, type_: type_,
bytes: bytes, bytes: bytes,
typeString: "".to_string(), typeString: "".into_string(),
global: GlobalField::from_rooted(global) global: GlobalField::from_rooted(global)
//isClosed_: false //isClosed_: false
} }
@ -97,7 +97,7 @@ impl<'a> BlobMethods for JSRef<'a, Blob> {
}; };
/* /*
let relativeContentType = match contentType { let relativeContentType = match contentType {
None => "".to_string(), None => "".into_string(),
Some(str) => str Some(str) => str
}; };
*/ */

6
components/script/dom/characterdata.rs
View file

@ -81,7 +81,7 @@ impl<'a> CharacterDataMethods for JSRef<'a, CharacterData> {
} }
fn SubstringData(self, offset: u32, count: u32) -> Fallible<DOMString> { fn SubstringData(self, offset: u32, count: u32) -> Fallible<DOMString> {
Ok(self.data.borrow().as_slice().slice(offset as uint, count as uint).to_string()) Ok(self.data.borrow().as_slice().slice(offset as uint, count as uint).into_string())
} }
fn AppendData(self, arg: DOMString) -> ErrorResult { fn AppendData(self, arg: DOMString) -> ErrorResult {
@ -94,7 +94,7 @@ impl<'a> CharacterDataMethods for JSRef<'a, CharacterData> {
} }
fn DeleteData(self, offset: u32, count: u32) -> ErrorResult { fn DeleteData(self, offset: u32, count: u32) -> ErrorResult {
self.ReplaceData(offset, count, "".to_string()) self.ReplaceData(offset, count, "".into_string())
} }
fn ReplaceData(self, offset: u32, count: u32, arg: DOMString) -> ErrorResult { fn ReplaceData(self, offset: u32, count: u32, arg: DOMString) -> ErrorResult {
@ -107,7 +107,7 @@ impl<'a> CharacterDataMethods for JSRef<'a, CharacterData> {
} else { } else {
count count
}; };
let mut data = self.data.borrow().as_slice().slice(0, offset as uint).to_string(); let mut data = self.data.borrow().as_slice().slice(0, offset as uint).into_string();
data.push_str(arg.as_slice()); data.push_str(arg.as_slice());
data.push_str(self.data.borrow().as_slice().slice((offset + count) as uint, length as uint)); data.push_str(self.data.borrow().as_slice().slice((offset + count) as uint, length as uint));
*self.data.borrow_mut() = data; *self.data.borrow_mut() = data;

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

@ -83,12 +83,12 @@ pub fn create_element(name: QualName, prefix: Option<DOMString>,
document: JSRef<Document>, creator: ElementCreator) document: JSRef<Document>, creator: ElementCreator)
-> Temporary<Element> { -> Temporary<Element> {
if name.ns != ns!(HTML) { if name.ns != ns!(HTML) {
return Element::new(name.local.as_slice().to_string(), name.ns, prefix, document); return Element::new(name.local.as_slice().into_string(), name.ns, prefix, document);
} }
macro_rules! make( macro_rules! make(
($ctor:ident $(, $arg:expr)*) => ({ ($ctor:ident $(, $arg:expr)*) => ({
let obj = $ctor::new(name.local.as_slice().to_string(), prefix, document $(, $arg)*); let obj = $ctor::new(name.local.as_slice().into_string(), prefix, document $(, $arg)*);
ElementCast::from_temporary(obj) ElementCast::from_temporary(obj)
}) })
) )

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

@ -338,7 +338,7 @@ impl<'a> DocumentHelpers<'a> for JSRef<'a, Document> {
self.ready_state.set(state); self.ready_state.set(state);
let window = self.window.root(); let window = self.window.root();
let event = Event::new(GlobalRef::Window(*window), "readystatechange".to_string(), let event = Event::new(GlobalRef::Window(*window), "readystatechange".into_string(),
EventBubbles::DoesNotBubble, EventBubbles::DoesNotBubble,
EventCancelable::NotCancelable).root(); EventCancelable::NotCancelable).root();
let target: JSRef<EventTarget> = EventTargetCast::from_ref(self); let target: JSRef<EventTarget> = EventTargetCast::from_ref(self);
@ -424,9 +424,9 @@ impl Document {
Some(string) => string.clone(), Some(string) => string.clone(),
None => match is_html_document { None => match is_html_document {
// http://dom.spec.whatwg.org/#dom-domimplementation-createhtmldocument // http://dom.spec.whatwg.org/#dom-domimplementation-createhtmldocument
IsHTMLDocument::HTMLDocument => "text/html".to_string(), IsHTMLDocument::HTMLDocument => "text/html".into_string(),
// http://dom.spec.whatwg.org/#concept-document-content-type // http://dom.spec.whatwg.org/#concept-document-content-type
IsHTMLDocument::NonHTMLDocument => "application/xml".to_string() IsHTMLDocument::NonHTMLDocument => "application/xml".into_string()
} }
}, },
last_modified: DOMRefCell::new(None), last_modified: DOMRefCell::new(None),
@ -434,7 +434,7 @@ impl Document {
// http://dom.spec.whatwg.org/#concept-document-quirks // http://dom.spec.whatwg.org/#concept-document-quirks
quirks_mode: Cell::new(NoQuirks), quirks_mode: Cell::new(NoQuirks),
// http://dom.spec.whatwg.org/#concept-document-encoding // http://dom.spec.whatwg.org/#concept-document-encoding
encoding_name: DOMRefCell::new("UTF-8".to_string()), encoding_name: DOMRefCell::new("UTF-8".into_string()),
is_html_document: is_html_document == IsHTMLDocument::HTMLDocument, is_html_document: is_html_document == IsHTMLDocument::HTMLDocument,
images: Default::default(), images: Default::default(),
embeds: Default::default(), embeds: Default::default(),
@ -522,8 +522,8 @@ impl<'a> DocumentMethods for JSRef<'a, Document> {
// http://dom.spec.whatwg.org/#dom-document-compatmode // http://dom.spec.whatwg.org/#dom-document-compatmode
fn CompatMode(self) -> DOMString { fn CompatMode(self) -> DOMString {
match self.quirks_mode.get() { match self.quirks_mode.get() {
LimitedQuirks | NoQuirks => "CSS1Compat".to_string(), LimitedQuirks | NoQuirks => "CSS1Compat".into_string(),
Quirks => "BackCompat".to_string() Quirks => "BackCompat".into_string()
} }
} }
@ -641,7 +641,7 @@ impl<'a> DocumentMethods for JSRef<'a, Document> {
} }
let name = QualName::new(ns, Atom::from_slice(local_name_from_qname)); let name = QualName::new(ns, Atom::from_slice(local_name_from_qname));
Ok(Element::create(name, prefix_from_qname.map(|s| s.to_string()), self, Ok(Element::create(name, prefix_from_qname.map(|s| s.into_string()), self,
ElementCreator::ScriptCreated)) ElementCreator::ScriptCreated))
} }
@ -656,7 +656,7 @@ impl<'a> DocumentMethods for JSRef<'a, Document> {
let name = Atom::from_slice(local_name.as_slice()); let name = Atom::from_slice(local_name.as_slice());
// repetition used because string_cache::atom::Atom is non-copyable // repetition used because string_cache::atom::Atom is non-copyable
let l_name = Atom::from_slice(local_name.as_slice()); let l_name = Atom::from_slice(local_name.as_slice());
let value = AttrValue::String("".to_string()); let value = AttrValue::String("".into_string());
Ok(Attr::new(*window, name, value, l_name, ns!(""), None, None)) Ok(Attr::new(*window, name, value, l_name, ns!(""), None, None))
} }
@ -804,7 +804,7 @@ impl<'a> DocumentMethods for JSRef<'a, Document> {
} }
}, },
None => { None => {
let new_title = HTMLTitleElement::new("title".to_string(), None, self).root(); let new_title = HTMLTitleElement::new("title".into_string(), None, self).root();
let new_title: JSRef<Node> = NodeCast::from_ref(*new_title); let new_title: JSRef<Node> = NodeCast::from_ref(*new_title);
if !title.is_empty() { if !title.is_empty() {

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

@ -36,8 +36,8 @@ impl DocumentType {
DocumentType { DocumentType {
node: Node::new_inherited(NodeTypeId::DocumentType, document), node: Node::new_inherited(NodeTypeId::DocumentType, document),
name: name, name: name,
public_id: public_id.unwrap_or("".to_string()), public_id: public_id.unwrap_or("".into_string()),
system_id: system_id.unwrap_or("".to_string()) system_id: system_id.unwrap_or("".into_string())
} }
} }
#[allow(unrooted_must_root)] #[allow(unrooted_must_root)]

2
components/script/dom/domexception.rs
View file

@ -130,6 +130,6 @@ impl<'a> DOMExceptionMethods for JSRef<'a, DOMException> {
DOMErrorName::EncodingError => "The encoding operation (either encoded or decoding) failed." DOMErrorName::EncodingError => "The encoding operation (either encoded or decoding) failed."
}; };
message.to_string() message.into_string()
} }
} }

10
components/script/dom/domimplementation.rs
View file

@ -129,18 +129,18 @@ impl<'a> DOMImplementationMethods for JSRef<'a, DOMImplementation> {
{ {
// Step 3. // Step 3.
let doc_type = DocumentType::new("html".to_string(), None, None, *doc).root(); let doc_type = DocumentType::new("html".into_string(), None, None, *doc).root();
assert!(doc_node.AppendChild(NodeCast::from_ref(*doc_type)).is_ok()); assert!(doc_node.AppendChild(NodeCast::from_ref(*doc_type)).is_ok());
} }
{ {
// Step 4. // Step 4.
let doc_html: Root<Node> = NodeCast::from_temporary(HTMLHtmlElement::new("html".to_string(), None, *doc)).root(); let doc_html: Root<Node> = NodeCast::from_temporary(HTMLHtmlElement::new("html".into_string(), None, *doc)).root();
assert!(doc_node.AppendChild(*doc_html).is_ok()); assert!(doc_node.AppendChild(*doc_html).is_ok());
{ {
// Step 5. // Step 5.
let doc_head: Root<Node> = NodeCast::from_temporary(HTMLHeadElement::new("head".to_string(), None, *doc)).root(); let doc_head: Root<Node> = NodeCast::from_temporary(HTMLHeadElement::new("head".into_string(), None, *doc)).root();
assert!(doc_html.AppendChild(*doc_head).is_ok()); assert!(doc_html.AppendChild(*doc_head).is_ok());
// Step 6. // Step 6.
@ -148,7 +148,7 @@ impl<'a> DOMImplementationMethods for JSRef<'a, DOMImplementation> {
None => (), None => (),
Some(title_str) => { Some(title_str) => {
// Step 6.1. // Step 6.1.
let doc_title: Root<Node> = NodeCast::from_temporary(HTMLTitleElement::new("title".to_string(), None, *doc)).root(); let doc_title: Root<Node> = NodeCast::from_temporary(HTMLTitleElement::new("title".into_string(), None, *doc)).root();
assert!(doc_head.AppendChild(*doc_title).is_ok()); assert!(doc_head.AppendChild(*doc_title).is_ok());
// Step 6.2. // Step 6.2.
@ -159,7 +159,7 @@ impl<'a> DOMImplementationMethods for JSRef<'a, DOMImplementation> {
} }
// Step 7. // Step 7.
let doc_body: Root<HTMLBodyElement> = HTMLBodyElement::new("body".to_string(), None, *doc).root(); let doc_body: Root<HTMLBodyElement> = HTMLBodyElement::new("body".into_string(), None, *doc).root();
assert!(doc_html.AppendChild(NodeCast::from_ref(*doc_body)).is_ok()); assert!(doc_html.AppendChild(NodeCast::from_ref(*doc_body)).is_ok());
} }

2
components/script/dom/domparser.rs
View file

@ -49,7 +49,7 @@ impl<'a> DOMParserMethods for JSRef<'a, DOMParser> {
-> Fallible<Temporary<Document>> { -> Fallible<Temporary<Document>> {
let window = self.window.root().clone(); let window = self.window.root().clone();
let url = window.get_url(); let url = window.get_url();
let content_type = DOMParserBinding::SupportedTypeValues::strings[ty as uint].to_string(); let content_type = DOMParserBinding::SupportedTypeValues::strings[ty as uint].into_string();
match ty { match ty {
Text_html => { Text_html => {
let document = Document::new(window, Some(url.clone()), let document = Document::new(window, Some(url.clone()),

2
components/script/dom/domtokenlist.rs
View file

@ -78,7 +78,7 @@ impl<'a> DOMTokenListMethods for JSRef<'a, DOMTokenList> {
// http://dom.spec.whatwg.org/#dom-domtokenlist-item // http://dom.spec.whatwg.org/#dom-domtokenlist-item
fn Item(self, index: u32) -> Option<DOMString> { fn Item(self, index: u32) -> Option<DOMString> {
self.attribute().root().and_then(|attr| attr.value().tokens().and_then(|tokens| { self.attribute().root().and_then(|attr| attr.value().tokens().and_then(|tokens| {
tokens.get(index as uint).map(|token| token.as_slice().to_string()) tokens.get(index as uint).map(|token| token.as_slice().into_string())
})) }))
} }

12
components/script/dom/element.rs
View file

@ -821,7 +821,7 @@ impl<'a> AttributeHandlers for JSRef<'a, Element> {
fn get_url_attribute(self, name: &Atom) -> DOMString { fn get_url_attribute(self, name: &Atom) -> DOMString {
assert!(name.as_slice() == name.as_slice().to_ascii_lower().as_slice()); assert!(name.as_slice() == name.as_slice().to_ascii_lower().as_slice());
if !self.has_attribute(name) { if !self.has_attribute(name) {
return "".to_string(); return "".into_string();
} }
let url = self.get_string_attribute(name); let url = self.get_string_attribute(name);
let doc = document_from_node(self).root(); let doc = document_from_node(self).root();
@ -830,7 +830,7 @@ impl<'a> AttributeHandlers for JSRef<'a, Element> {
// XXXManishearth this doesn't handle `javascript:` urls properly // XXXManishearth this doesn't handle `javascript:` urls properly
match UrlParser::new().base_url(base).parse(url.as_slice()) { match UrlParser::new().base_url(base).parse(url.as_slice()) {
Ok(parsed) => parsed.serialize(), Ok(parsed) => parsed.serialize(),
Err(_) => "".to_string() Err(_) => "".into_string()
} }
} }
fn set_url_attribute(self, name: &Atom, value: DOMString) { fn set_url_attribute(self, name: &Atom, value: DOMString) {
@ -840,7 +840,7 @@ impl<'a> AttributeHandlers for JSRef<'a, Element> {
fn get_string_attribute(self, name: &Atom) -> DOMString { fn get_string_attribute(self, name: &Atom) -> DOMString {
match self.get_attribute(ns!(""), name) { match self.get_attribute(ns!(""), name) {
Some(x) => x.root().Value(), Some(x) => x.root().Value(),
None => "".to_string() None => "".into_string()
} }
} }
fn set_string_attribute(self, name: &Atom, value: DOMString) { fn set_string_attribute(self, name: &Atom, value: DOMString) {
@ -894,12 +894,12 @@ impl<'a> ElementMethods for JSRef<'a, Element> {
fn GetNamespaceURI(self) -> Option<DOMString> { fn GetNamespaceURI(self) -> Option<DOMString> {
match self.namespace { match self.namespace {
ns!("") => None, ns!("") => None,
Namespace(ref ns) => Some(ns.as_slice().to_string()) Namespace(ref ns) => Some(ns.as_slice().into_string())
} }
} }
fn LocalName(self) -> DOMString { fn LocalName(self) -> DOMString {
self.local_name.as_slice().to_string() self.local_name.as_slice().into_string()
} }
// http://dom.spec.whatwg.org/#dom-element-prefix // http://dom.spec.whatwg.org/#dom-element-prefix
@ -1055,7 +1055,7 @@ impl<'a> ElementMethods for JSRef<'a, Element> {
// Step 9. // Step 9.
let value = self.parse_attribute(&namespace, &local_name, value); let value = self.parse_attribute(&namespace, &local_name, value);
self.do_set_attribute(local_name.clone(), value, name, self.do_set_attribute(local_name.clone(), value, name,
namespace.clone(), prefix.map(|s| s.to_string()), namespace.clone(), prefix.map(|s| s.into_string()),
|attr| { |attr| {
*attr.local_name() == local_name && *attr.local_name() == local_name &&
*attr.namespace() == namespace *attr.namespace() == namespace

6
components/script/dom/errorevent.rs
View file

@ -40,8 +40,8 @@ impl ErrorEvent {
fn new_inherited(type_id: EventTypeId) -> ErrorEvent { fn new_inherited(type_id: EventTypeId) -> ErrorEvent {
ErrorEvent { ErrorEvent {
event: Event::new_inherited(type_id), event: Event::new_inherited(type_id),
message: DOMRefCell::new("".to_string()), message: DOMRefCell::new("".into_string()),
filename: DOMRefCell::new("".to_string()), filename: DOMRefCell::new("".into_string()),
lineno: Cell::new(0), lineno: Cell::new(0),
colno: Cell::new(0), colno: Cell::new(0),
error: MutHeap::new(NullValue()) error: MutHeap::new(NullValue())
@ -80,7 +80,7 @@ impl ErrorEvent {
init: &ErrorEventBinding::ErrorEventInit) -> Fallible<Temporary<ErrorEvent>>{ init: &ErrorEventBinding::ErrorEventInit) -> Fallible<Temporary<ErrorEvent>>{
let msg = match init.message.as_ref() { let msg = match init.message.as_ref() {
Some(message) => message.clone(), Some(message) => message.clone(),
None => "".to_string(), None => "".into_string(),
}; };
let file_name = match init.filename.as_ref() { let file_name = match init.filename.as_ref() {

2
components/script/dom/event.rs
View file

@ -76,7 +76,7 @@ impl Event {
current_target: Default::default(), current_target: Default::default(),
target: Default::default(), target: Default::default(),
phase: Cell::new(EventPhase::None), phase: Cell::new(EventPhase::None),
type_: DOMRefCell::new("".to_string()), type_: DOMRefCell::new("".into_string()),
canceled: Cell::new(false), canceled: Cell::new(false),
cancelable: Cell::new(false), cancelable: Cell::new(false),
bubbles: Cell::new(false), bubbles: Cell::new(false),

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

@ -230,11 +230,11 @@ impl<'a> EventTargetHelpers for JSRef<'a, EventTarget> {
{ {
let event_listener = listener.map(|listener| let event_listener = listener.map(|listener|
EventListener::new(listener.callback())); EventListener::new(listener.callback()));
self.set_inline_event_listener(ty.to_string(), event_listener); self.set_inline_event_listener(ty.into_string(), event_listener);
} }
fn get_event_handler_common<T: CallbackContainer>(self, ty: &str) -> Option<T> { fn get_event_handler_common<T: CallbackContainer>(self, ty: &str) -> Option<T> {
let listener = self.get_inline_event_listener(ty.to_string()); let listener = self.get_inline_event_listener(ty.into_string());
listener.map(|listener| CallbackContainer::new(listener.parent.callback())) listener.map(|listener| CallbackContainer::new(listener.parent.callback()))
} }

2
components/script/dom/formdata.rs
View file

@ -121,7 +121,7 @@ impl PrivateFormDataHelpers for FormData {
fn get_file_from_blob(&self, value: JSRef<Blob>, filename: Option<DOMString>) -> Temporary<File> { fn get_file_from_blob(&self, value: JSRef<Blob>, filename: Option<DOMString>) -> Temporary<File> {
let global = self.global.root(); let global = self.global.root();
let f: Option<JSRef<File>> = FileCast::to_ref(value); let f: Option<JSRef<File>> = FileCast::to_ref(value);
let name = filename.unwrap_or(f.map(|inner| inner.name().clone()).unwrap_or("blob".to_string())); let name = filename.unwrap_or(f.map(|inner| inner.name().clone()).unwrap_or("blob".into_string()));
File::new(&global.root_ref(), value, name) File::new(&global.root_ref(), value, name)
} }
} }

2
components/script/dom/htmlbodyelement.rs
View file

@ -106,7 +106,7 @@ impl<'a> VirtualMethods for JSRef<'a, HTMLBodyElement> {
}; };
evtarget.set_event_handler_uncompiled(cx, url, reflector, evtarget.set_event_handler_uncompiled(cx, url, reflector,
name.slice_from(2), name.slice_from(2),
attr.value().as_slice().to_string()); attr.value().as_slice().into_string());
} }
match attr.local_name() { match attr.local_name() {

2
components/script/dom/htmlbuttonelement.rs
View file

@ -66,7 +66,7 @@ impl<'a> HTMLButtonElementMethods for JSRef<'a, HTMLButtonElement> {
// https://html.spec.whatwg.org/multipage/forms.html#attr-button-type // https://html.spec.whatwg.org/multipage/forms.html#attr-button-type
match ty.as_slice() { match ty.as_slice() {
"reset" | "button" | "menu" => ty, "reset" | "button" | "menu" => ty,
_ => "submit".to_string() _ => "submit".into_string()
} }
} }

2
components/script/dom/htmlelement.rs
View file

@ -198,7 +198,7 @@ impl<'a> VirtualMethods for JSRef<'a, HTMLElement> {
let evtarget: JSRef<EventTarget> = EventTargetCast::from_ref(*self); let evtarget: JSRef<EventTarget> = EventTargetCast::from_ref(*self);
evtarget.set_event_handler_uncompiled(cx, url, reflector, evtarget.set_event_handler_uncompiled(cx, url, reflector,
name.slice_from(2), name.slice_from(2),
attr.value().as_slice().to_string()); attr.value().as_slice().into_string());
} }
} }
} }

12
components/script/dom/htmlformelement.rs
View file

@ -157,7 +157,7 @@ impl<'a> HTMLFormElementHelpers for JSRef<'a, HTMLFormElement> {
// TODO: Handle browsing contexts // TODO: Handle browsing contexts
// TODO: Handle validation // TODO: Handle validation
let event = Event::new(GlobalRef::Window(*win), let event = Event::new(GlobalRef::Window(*win),
"submit".to_string(), "submit".into_string(),
EventBubbles::Bubbles, EventBubbles::Bubbles,
EventCancelable::Cancelable).root(); EventCancelable::Cancelable).root();
event.set_trusted(true); event.set_trusted(true);
@ -185,7 +185,7 @@ impl<'a> HTMLFormElementHelpers for JSRef<'a, HTMLFormElement> {
let parsed_data = match enctype { let parsed_data = match enctype {
FormEncType::UrlEncoded => serialize(form_data.iter().map(|d| (d.name.as_slice(), d.value.as_slice()))), FormEncType::UrlEncoded => serialize(form_data.iter().map(|d| (d.name.as_slice(), d.value.as_slice()))),
_ => "".to_string() // TODO: Add serializers for the other encoding types _ => "".into_string() // TODO: Add serializers for the other encoding types
}; };
let mut load_data = LoadData::new(action_components); let mut load_data = LoadData::new(action_components);
@ -213,7 +213,7 @@ impl<'a> HTMLFormElementHelpers for JSRef<'a, HTMLFormElement> {
fn clean_crlf(s: &str) -> DOMString { fn clean_crlf(s: &str) -> DOMString {
// https://html.spec.whatwg.org/multipage/forms.html#constructing-the-form-data-set // https://html.spec.whatwg.org/multipage/forms.html#constructing-the-form-data-set
// Step 4 // Step 4
let mut buf = "".to_string(); let mut buf = "".into_string();
let mut prev = ' '; let mut prev = ' ';
for ch in s.chars() { for ch in s.chars() {
match ch { match ch {
@ -283,7 +283,7 @@ impl<'a> HTMLFormElementHelpers for JSRef<'a, HTMLFormElement> {
"image" => None, // Unimplemented "image" => None, // Unimplemented
"radio" | "checkbox" => { "radio" | "checkbox" => {
if value.is_empty() { if value.is_empty() {
value = "on".to_string(); value = "on".into_string();
} }
Some(FormDatum { Some(FormDatum {
ty: ty, ty: ty,
@ -345,7 +345,7 @@ impl<'a> HTMLFormElementHelpers for JSRef<'a, HTMLFormElement> {
let win = window_from_node(self).root(); let win = window_from_node(self).root();
let event = Event::new(GlobalRef::Window(*win), let event = Event::new(GlobalRef::Window(*win),
"reset".to_string(), "reset".into_string(),
EventBubbles::Bubbles, EventBubbles::Bubbles,
EventCancelable::Cancelable).root(); EventCancelable::Cancelable).root();
let target: JSRef<EventTarget> = EventTargetCast::from_ref(self); let target: JSRef<EventTarget> = EventTargetCast::from_ref(self);
@ -515,7 +515,7 @@ pub trait FormControl<'a> : Copy {
if self.to_element().has_attribute(attr) { if self.to_element().has_attribute(attr) {
input(self) input(self)
} else { } else {
self.form_owner().map_or("".to_string(), |t| owner(*t.root())) self.form_owner().map_or("".into_string(), |t| owner(*t.root()))
} }
} }
fn to_element(self) -> JSRef<'a, Element>; fn to_element(self) -> JSRef<'a, Element>;

2
components/script/dom/htmlimageelement.rs
View file

@ -188,7 +188,7 @@ impl<'a> VirtualMethods for JSRef<'a, HTMLImageElement> {
&atom!("src") => { &atom!("src") => {
let window = window_from_node(*self).root(); let window = window_from_node(*self).root();
let url = window.get_url(); let url = window.get_url();
self.update_image(Some((attr.value().as_slice().to_string(), &url))); self.update_image(Some((attr.value().as_slice().into_string(), &url)));
}, },
_ => () _ => ()
} }

28
components/script/dom/htmlinputelement.rs
View file

@ -116,7 +116,7 @@ impl HTMLInputElement {
checked_changed: Cell::new(false), checked_changed: Cell::new(false),
value_changed: Cell::new(false), value_changed: Cell::new(false),
size: Cell::new(DEFAULT_INPUT_SIZE), size: Cell::new(DEFAULT_INPUT_SIZE),
textinput: DOMRefCell::new(TextInput::new(Single, "".to_string())), textinput: DOMRefCell::new(TextInput::new(Single, "".into_string())),
activation_state: DOMRefCell::new(InputActivationState::new()) activation_state: DOMRefCell::new(InputActivationState::new())
} }
} }
@ -149,15 +149,15 @@ impl LayoutHTMLInputElementHelpers for JS<HTMLInputElement> {
unsafe fn get_raw_attr_value(input: JS<HTMLInputElement>) -> Option<String> { unsafe fn get_raw_attr_value(input: JS<HTMLInputElement>) -> Option<String> {
let elem: JS<Element> = input.transmute_copy(); let elem: JS<Element> = input.transmute_copy();
(*elem.unsafe_get()).get_attr_val_for_layout(&ns!(""), &atom!("value")) (*elem.unsafe_get()).get_attr_val_for_layout(&ns!(""), &atom!("value"))
.map(|s| s.to_string()) .map(|s| s.into_string())
} }
match (*self.unsafe_get()).input_type.get() { match (*self.unsafe_get()).input_type.get() {
InputType::InputCheckbox | InputType::InputRadio => "".to_string(), InputType::InputCheckbox | InputType::InputRadio => "".into_string(),
InputType::InputFile | InputType::InputImage => "".to_string(), InputType::InputFile | InputType::InputImage => "".into_string(),
InputType::InputButton => get_raw_attr_value(self).unwrap_or_else(|| "".to_string()), InputType::InputButton => get_raw_attr_value(self).unwrap_or_else(|| "".into_string()),
InputType::InputSubmit => get_raw_attr_value(self).unwrap_or_else(|| DEFAULT_SUBMIT_VALUE.to_string()), InputType::InputSubmit => get_raw_attr_value(self).unwrap_or_else(|| DEFAULT_SUBMIT_VALUE.into_string()),
InputType::InputReset => get_raw_attr_value(self).unwrap_or_else(|| DEFAULT_RESET_VALUE.to_string()), InputType::InputReset => get_raw_attr_value(self).unwrap_or_else(|| DEFAULT_RESET_VALUE.into_string()),
InputType::InputPassword => { InputType::InputPassword => {
let raw = get_raw_textinput_value(self); let raw = get_raw_textinput_value(self);
String::from_char(raw.char_len(), '●') String::from_char(raw.char_len(), '●')
@ -312,7 +312,7 @@ fn broadcast_radio_checked(broadcaster: JSRef<HTMLInputElement>, group: Option<&
// There is no DOM tree manipulation here, so this is safe // There is no DOM tree manipulation here, so this is safe
let mut iter = unsafe { let mut iter = unsafe {
doc_node.query_selector_iter("input[type=radio]".to_string()).unwrap() doc_node.query_selector_iter("input[type=radio]".into_string()).unwrap()
.filter_map(|t| HTMLInputElementCast::to_ref(t)) .filter_map(|t| HTMLInputElementCast::to_ref(t))
.filter(|&r| in_same_group(r, owner.root_ref(), group) && broadcaster != r) .filter(|&r| in_same_group(r, owner.root_ref(), group) && broadcaster != r)
}; };
@ -438,7 +438,7 @@ impl<'a> VirtualMethods for JSRef<'a, HTMLInputElement> {
} }
&atom!("value") => { &atom!("value") => {
if !self.value_changed.get() { if !self.value_changed.get() {
self.textinput.borrow_mut().set_content(attr.value().as_slice().to_string()); self.textinput.borrow_mut().set_content(attr.value().as_slice().into_string());
self.force_relayout(); self.force_relayout();
} }
} }
@ -487,7 +487,7 @@ impl<'a> VirtualMethods for JSRef<'a, HTMLInputElement> {
} }
&atom!("value") => { &atom!("value") => {
if !self.value_changed.get() { if !self.value_changed.get() {
self.textinput.borrow_mut().set_content("".to_string()); self.textinput.borrow_mut().set_content("".into_string());
self.force_relayout(); self.force_relayout();
} }
} }
@ -643,7 +643,7 @@ impl<'a> Activatable for JSRef<'a, HTMLInputElement> {
// Safe since we only manipulate the DOM tree after finding an element // Safe since we only manipulate the DOM tree after finding an element
let checked_member = unsafe { let checked_member = unsafe {
doc_node.query_selector_iter("input[type=radio]".to_string()).unwrap() doc_node.query_selector_iter("input[type=radio]".into_string()).unwrap()
.filter_map(|t| HTMLInputElementCast::to_ref(t)) .filter_map(|t| HTMLInputElementCast::to_ref(t))
.filter(|&r| in_same_group(r, owner.root_ref(), .filter(|&r| in_same_group(r, owner.root_ref(),
group.as_ref().map(|gr| gr.as_slice()))) group.as_ref().map(|gr| gr.as_slice())))
@ -743,7 +743,7 @@ impl<'a> Activatable for JSRef<'a, HTMLInputElement> {
if self.mutable() { if self.mutable() {
let win = window_from_node(*self).root(); let win = window_from_node(*self).root();
let event = Event::new(GlobalRef::Window(*win), let event = Event::new(GlobalRef::Window(*win),
"input".to_string(), "input".into_string(),
EventBubbles::Bubbles, EventBubbles::Bubbles,
EventCancelable::NotCancelable).root(); EventCancelable::NotCancelable).root();
event.set_trusted(true); event.set_trusted(true);
@ -751,7 +751,7 @@ impl<'a> Activatable for JSRef<'a, HTMLInputElement> {
target.DispatchEvent(*event).ok(); target.DispatchEvent(*event).ok();
let event = Event::new(GlobalRef::Window(*win), let event = Event::new(GlobalRef::Window(*win),
"change".to_string(), "change".into_string(),
EventBubbles::Bubbles, EventBubbles::Bubbles,
EventCancelable::NotCancelable).root(); EventCancelable::NotCancelable).root();
event.set_trusted(true); event.set_trusted(true);
@ -774,7 +774,7 @@ impl<'a> Activatable for JSRef<'a, HTMLInputElement> {
// This is safe because we are stopping after finding the first element // This is safe because we are stopping after finding the first element
// and only then performing actions which may modify the DOM tree // and only then performing actions which may modify the DOM tree
unsafe { unsafe {
node.query_selector_iter("input[type=submit]".to_string()).unwrap() node.query_selector_iter("input[type=submit]".into_string()).unwrap()
.filter_map(|t| HTMLInputElementCast::to_ref(t)) .filter_map(|t| HTMLInputElementCast::to_ref(t))
.find(|r| r.form_owner() == owner) .find(|r| r.form_owner() == owner)
.map(|s| s.synthetic_click_activation(ctrlKey, shiftKey, altKey, metaKey)); .map(|s| s.synthetic_click_activation(ctrlKey, shiftKey, altKey, metaKey));

2
components/script/dom/htmllinkelement.rs
View file

@ -54,7 +54,7 @@ impl HTMLLinkElement {
fn get_attr(element: JSRef<Element>, name: &Atom) -> Option<String> { fn get_attr(element: JSRef<Element>, name: &Atom) -> Option<String> {
let elem = element.get_attribute(ns!(""), name).root(); let elem = element.get_attribute(ns!(""), name).root();
elem.map(|e| e.value().as_slice().to_string()) elem.map(|e| e.value().as_slice().into_string())
} }
fn is_stylesheet(value: &Option<String>) -> bool { fn is_stylesheet(value: &Option<String>) -> bool {

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

@ -68,9 +68,9 @@ impl<'a> HTMLSelectElementMethods for JSRef<'a, HTMLSelectElement> {
fn Type(self) -> DOMString { fn Type(self) -> DOMString {
let elem: JSRef<Element> = ElementCast::from_ref(self); let elem: JSRef<Element> = ElementCast::from_ref(self);
if elem.has_attribute(&atom!("multiple")) { if elem.has_attribute(&atom!("multiple")) {
"select-multiple".to_string() "select-multiple".into_string()
} else { } else {
"select-one".to_string() "select-one".into_string()
} }
} }
} }

2
components/script/dom/htmlserializer.rs
View file

@ -126,7 +126,7 @@ fn serialize_elem(elem: JSRef<Element>, open_elements: &mut Vec<String>, html: &
} }
if !(elem.is_void()) { if !(elem.is_void()) {
open_elements.push(elem.local_name().as_slice().to_string()); open_elements.push(elem.local_name().as_slice().into_string());
} }
} }

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

@ -83,7 +83,7 @@ impl HTMLTextAreaElement {
fn new_inherited(localName: DOMString, prefix: Option<DOMString>, document: JSRef<Document>) -> HTMLTextAreaElement { fn new_inherited(localName: DOMString, prefix: Option<DOMString>, document: JSRef<Document>) -> HTMLTextAreaElement {
HTMLTextAreaElement { HTMLTextAreaElement {
htmlelement: HTMLElement::new_inherited(ElementTypeId::HTMLTextAreaElement, localName, prefix, document), htmlelement: HTMLElement::new_inherited(ElementTypeId::HTMLTextAreaElement, localName, prefix, document),
textinput: DOMRefCell::new(TextInput::new(Lines::Multiple, "".to_string())), textinput: DOMRefCell::new(TextInput::new(Lines::Multiple, "".into_string())),
cols: Cell::new(DEFAULT_COLS), cols: Cell::new(DEFAULT_COLS),
rows: Cell::new(DEFAULT_ROWS), rows: Cell::new(DEFAULT_ROWS),
value_changed: Cell::new(false), value_changed: Cell::new(false),
@ -151,7 +151,7 @@ impl<'a> HTMLTextAreaElementMethods for JSRef<'a, HTMLTextAreaElement> {
// https://html.spec.whatwg.org/multipage/forms.html#dom-textarea-type // https://html.spec.whatwg.org/multipage/forms.html#dom-textarea-type
fn Type(self) -> DOMString { fn Type(self) -> DOMString {
"textarea".to_string() "textarea".into_string()
} }
// https://html.spec.whatwg.org/multipage/forms.html#dom-textarea-defaultvalue // https://html.spec.whatwg.org/multipage/forms.html#dom-textarea-defaultvalue

6
components/script/dom/keyboardevent.rs
View file

@ -44,8 +44,8 @@ impl KeyboardEvent {
fn new_inherited() -> KeyboardEvent { fn new_inherited() -> KeyboardEvent {
KeyboardEvent { KeyboardEvent {
uievent: UIEvent::new_inherited(EventTypeId::KeyboardEvent), uievent: UIEvent::new_inherited(EventTypeId::KeyboardEvent),
key: RefCell::new("".to_string()), key: RefCell::new("".into_string()),
code: RefCell::new("".to_string()), code: RefCell::new("".into_string()),
location: Cell::new(0), location: Cell::new(0),
ctrl: Cell::new(false), ctrl: Cell::new(false),
alt: Cell::new(false), alt: Cell::new(false),
@ -83,7 +83,7 @@ impl KeyboardEvent {
key_code: u32) -> Temporary<KeyboardEvent> { key_code: u32) -> Temporary<KeyboardEvent> {
let ev = KeyboardEvent::new_uninitialized(window).root(); let ev = KeyboardEvent::new_uninitialized(window).root();
ev.deref().InitKeyboardEvent(type_, canBubble, cancelable, view, key, location, ev.deref().InitKeyboardEvent(type_, canBubble, cancelable, view, key, location,
"".to_string(), repeat, "".to_string()); "".into_string(), repeat, "".into_string());
*ev.code.borrow_mut() = code; *ev.code.borrow_mut() = code;
ev.ctrl.set(ctrlKey); ev.ctrl.set(ctrlKey);
ev.alt.set(altKey); ev.alt.set(altKey);

2
components/script/dom/macros.rs
View file

@ -112,7 +112,7 @@ macro_rules! make_enumerated_getter(
// https://html.spec.whatwg.org/multipage/forms.html#attr-fs-method // https://html.spec.whatwg.org/multipage/forms.html#attr-fs-method
match val.as_slice() { match val.as_slice() {
$($choices)|+ => val, $($choices)|+ => val,
_ => $default.to_string() _ => $default.into_string()
} }
} }
); );

6
components/script/dom/messageevent.rs
View file

@ -44,7 +44,7 @@ impl MessageEvent {
} }
pub fn new_uninitialized(global: GlobalRef) -> Temporary<MessageEvent> { pub fn new_uninitialized(global: GlobalRef) -> Temporary<MessageEvent> {
MessageEvent::new_initialized(global, UndefinedValue(), "".to_string(), "".to_string()) MessageEvent::new_initialized(global, UndefinedValue(), "".into_string(), "".into_string())
} }
pub fn new_initialized(global: GlobalRef, data: JSVal, origin: DOMString, lastEventId: DOMString) -> Temporary<MessageEvent> { pub fn new_initialized(global: GlobalRef, data: JSVal, origin: DOMString, lastEventId: DOMString) -> Temporary<MessageEvent> {
@ -78,8 +78,8 @@ impl MessageEvent {
scope: GlobalRef, scope: GlobalRef,
message: JSVal) { message: JSVal) {
let messageevent = MessageEvent::new( let messageevent = MessageEvent::new(
scope, "message".to_string(), false, false, message, scope, "message".into_string(), false, false, message,
"".to_string(), "".to_string()).root(); "".into_string(), "".into_string()).root();
let event: JSRef<Event> = EventCast::from_ref(*messageevent); let event: JSRef<Event> = EventCast::from_ref(*messageevent);
target.dispatch_event(event); target.dispatch_event(event);
} }

10
components/script/dom/navigatorinfo.rs
View file

@ -9,7 +9,7 @@ pub struct NavigatorInfo;
impl NavigatorInfo { impl NavigatorInfo {
pub fn Product() -> DOMString { pub fn Product() -> DOMString {
"Gecko".to_string() "Gecko".into_string()
} }
pub fn TaintEnabled() -> bool { pub fn TaintEnabled() -> bool {
@ -17,21 +17,21 @@ impl NavigatorInfo {
} }
pub fn AppName() -> DOMString { pub fn AppName() -> DOMString {
"Netscape".to_string() // Like Gecko/Webkit "Netscape".into_string() // Like Gecko/Webkit
} }
pub fn AppCodeName() -> DOMString { pub fn AppCodeName() -> DOMString {
"Mozilla".to_string() "Mozilla".into_string()
} }
pub fn Platform() -> DOMString { pub fn Platform() -> DOMString {
"".to_string() "".into_string()
} }
pub fn UserAgent() -> DOMString { pub fn UserAgent() -> DOMString {
match opts::get().user_agent { match opts::get().user_agent {
Some(ref user_agent) => user_agent.clone(), Some(ref user_agent) => user_agent.clone(),
None => "".to_string(), None => "".into_string(),
} }
} }
} }

24
components/script/dom/node.rs
View file

@ -843,17 +843,17 @@ impl<'a> NodeHelpers<'a> for JSRef<'a, Node> {
NodeInfo { NodeInfo {
uniqueId: self.unique_id.borrow().clone(), uniqueId: self.unique_id.borrow().clone(),
baseURI: self.GetBaseURI().unwrap_or("".to_string()), baseURI: self.GetBaseURI().unwrap_or("".into_string()),
parent: self.GetParentNode().root().map(|node| node.get_unique_id()).unwrap_or("".to_string()), parent: self.GetParentNode().root().map(|node| node.get_unique_id()).unwrap_or("".into_string()),
nodeType: self.NodeType() as uint, nodeType: self.NodeType() as uint,
namespaceURI: "".to_string(), //FIXME namespaceURI: "".into_string(), //FIXME
nodeName: self.NodeName(), nodeName: self.NodeName(),
numChildren: self.ChildNodes().root().Length() as uint, numChildren: self.ChildNodes().root().Length() as uint,
//FIXME doctype nodes only //FIXME doctype nodes only
name: "".to_string(), name: "".into_string(),
publicId: "".to_string(), publicId: "".into_string(),
systemId: "".to_string(), systemId: "".into_string(),
attrs: match ElementCast::to_ref(self) { attrs: match ElementCast::to_ref(self) {
Some(element) => element.summarize(), Some(element) => element.summarize(),
@ -866,7 +866,7 @@ impl<'a> NodeHelpers<'a> for JSRef<'a, Node> {
.map(|elem| NodeCast::from_ref(*elem.root()) == self) .map(|elem| NodeCast::from_ref(*elem.root()) == self)
.unwrap_or(false), .unwrap_or(false),
shortValue: self.GetNodeValue().unwrap_or("".to_string()), //FIXME: truncate shortValue: self.GetNodeValue().unwrap_or("".into_string()), //FIXME: truncate
incompleteValue: false, //FIXME: reflect truncation incompleteValue: false, //FIXME: reflect truncation
} }
} }
@ -1551,7 +1551,7 @@ impl Node {
local: element.local_name().clone() local: element.local_name().clone()
}; };
let element = Element::create(name, let element = Element::create(name,
element.prefix().as_ref().map(|p| p.as_slice().to_string()), element.prefix().as_ref().map(|p| p.as_slice().into_string()),
*document, ElementCreator::ScriptCreated); *document, ElementCreator::ScriptCreated);
NodeCast::from_temporary(element) NodeCast::from_temporary(element)
}, },
@ -1664,19 +1664,19 @@ impl<'a> NodeMethods for JSRef<'a, Node> {
let elem: JSRef<Element> = ElementCast::to_ref(self).unwrap(); let elem: JSRef<Element> = ElementCast::to_ref(self).unwrap();
elem.TagName() elem.TagName()
} }
NodeTypeId::Text => "#text".to_string(), NodeTypeId::Text => "#text".into_string(),
NodeTypeId::ProcessingInstruction => { NodeTypeId::ProcessingInstruction => {
let processing_instruction: JSRef<ProcessingInstruction> = let processing_instruction: JSRef<ProcessingInstruction> =
ProcessingInstructionCast::to_ref(self).unwrap(); ProcessingInstructionCast::to_ref(self).unwrap();
processing_instruction.Target() processing_instruction.Target()
} }
NodeTypeId::Comment => "#comment".to_string(), NodeTypeId::Comment => "#comment".into_string(),
NodeTypeId::DocumentType => { NodeTypeId::DocumentType => {
let doctype: JSRef<DocumentType> = DocumentTypeCast::to_ref(self).unwrap(); let doctype: JSRef<DocumentType> = DocumentTypeCast::to_ref(self).unwrap();
doctype.name().clone() doctype.name().clone()
}, },
NodeTypeId::DocumentFragment => "#document-fragment".to_string(), NodeTypeId::DocumentFragment => "#document-fragment".into_string(),
NodeTypeId::Document => "#document".to_string() NodeTypeId::Document => "#document".into_string()
} }
} }

16
components/script/dom/testbinding.rs
View file

@ -51,7 +51,7 @@ impl<'a> TestBindingMethods for JSRef<'a, TestBinding> {
fn SetFloatAttribute(self, _: f32) {} fn SetFloatAttribute(self, _: f32) {}
fn DoubleAttribute(self) -> f64 { 0. } fn DoubleAttribute(self) -> f64 { 0. }
fn SetDoubleAttribute(self, _: f64) {} fn SetDoubleAttribute(self, _: f64) {}
fn StringAttribute(self) -> DOMString { "".to_string() } fn StringAttribute(self) -> DOMString { "".into_string() }
fn SetStringAttribute(self, _: DOMString) {} fn SetStringAttribute(self, _: DOMString) {}
fn ByteStringAttribute(self) -> ByteString { ByteString::new(vec!()) } fn ByteStringAttribute(self) -> ByteString { ByteString::new(vec!()) }
fn SetByteStringAttribute(self, _: ByteString) {} fn SetByteStringAttribute(self, _: ByteString) {}
@ -64,7 +64,7 @@ impl<'a> TestBindingMethods for JSRef<'a, TestBinding> {
fn SetInterfaceAttribute(self, _: JSRef<Blob>) {} fn SetInterfaceAttribute(self, _: JSRef<Blob>) {}
fn UnionAttribute(self) -> HTMLElementOrLong { eLong(0) } fn UnionAttribute(self) -> HTMLElementOrLong { eLong(0) }
fn SetUnionAttribute(self, _: HTMLElementOrLong) {} fn SetUnionAttribute(self, _: HTMLElementOrLong) {}
fn Union2Attribute(self) -> EventOrString { eString("".to_string()) } fn Union2Attribute(self) -> EventOrString { eString("".into_string()) }
fn SetUnion2Attribute(self, _: EventOrString) {} fn SetUnion2Attribute(self, _: EventOrString) {}
fn ArrayAttribute(self, _: *mut JSContext) -> *mut JSObject { NullValue().to_object_or_null() } fn ArrayAttribute(self, _: *mut JSContext) -> *mut JSObject { NullValue().to_object_or_null() }
fn AnyAttribute(self, _: *mut JSContext) -> JSVal { NullValue() } fn AnyAttribute(self, _: *mut JSContext) -> JSVal { NullValue() }
@ -94,7 +94,7 @@ impl<'a> TestBindingMethods for JSRef<'a, TestBinding> {
fn SetDoubleAttributeNullable(self, _: Option<f64>) {} fn SetDoubleAttributeNullable(self, _: Option<f64>) {}
fn GetByteStringAttributeNullable(self) -> Option<ByteString> { Some(ByteString::new(vec!())) } fn GetByteStringAttributeNullable(self) -> Option<ByteString> { Some(ByteString::new(vec!())) }
fn SetByteStringAttributeNullable(self, _: Option<ByteString>) {} fn SetByteStringAttributeNullable(self, _: Option<ByteString>) {}
fn GetStringAttributeNullable(self) -> Option<DOMString> { Some("".to_string()) } fn GetStringAttributeNullable(self) -> Option<DOMString> { Some("".into_string()) }
fn SetStringAttributeNullable(self, _: Option<DOMString>) {} fn SetStringAttributeNullable(self, _: Option<DOMString>) {}
fn GetEnumAttributeNullable(self) -> Option<TestEnum> { Some(_empty) } fn GetEnumAttributeNullable(self) -> Option<TestEnum> { Some(_empty) }
fn GetInterfaceAttributeNullable(self) -> Option<Temporary<Blob>> { fn GetInterfaceAttributeNullable(self) -> Option<Temporary<Blob>> {
@ -104,7 +104,7 @@ impl<'a> TestBindingMethods for JSRef<'a, TestBinding> {
fn SetInterfaceAttributeNullable(self, _: Option<JSRef<Blob>>) {} fn SetInterfaceAttributeNullable(self, _: Option<JSRef<Blob>>) {}
fn GetUnionAttributeNullable(self) -> Option<HTMLElementOrLong> { Some(eLong(0)) } fn GetUnionAttributeNullable(self) -> Option<HTMLElementOrLong> { Some(eLong(0)) }
fn SetUnionAttributeNullable(self, _: Option<HTMLElementOrLong>) {} fn SetUnionAttributeNullable(self, _: Option<HTMLElementOrLong>) {}
fn GetUnion2AttributeNullable(self) -> Option<EventOrString> { Some(eString("".to_string())) } fn GetUnion2AttributeNullable(self) -> Option<EventOrString> { Some(eString("".into_string())) }
fn SetUnion2AttributeNullable(self, _: Option<EventOrString>) {} fn SetUnion2AttributeNullable(self, _: Option<EventOrString>) {}
fn ReceiveVoid(self) -> () {} fn ReceiveVoid(self) -> () {}
fn ReceiveBoolean(self) -> bool { false } fn ReceiveBoolean(self) -> bool { false }
@ -118,7 +118,7 @@ impl<'a> TestBindingMethods for JSRef<'a, TestBinding> {
fn ReceiveUnsignedLongLong(self) -> u64 { 0 } fn ReceiveUnsignedLongLong(self) -> u64 { 0 }
fn ReceiveFloat(self) -> f32 { 0. } fn ReceiveFloat(self) -> f32 { 0. }
fn ReceiveDouble(self) -> f64 { 0. } fn ReceiveDouble(self) -> f64 { 0. }
fn ReceiveString(self) -> DOMString { "".to_string() } fn ReceiveString(self) -> DOMString { "".into_string() }
fn ReceiveByteString(self) -> ByteString { ByteString::new(vec!()) } fn ReceiveByteString(self) -> ByteString { ByteString::new(vec!()) }
fn ReceiveEnum(self) -> TestEnum { _empty } fn ReceiveEnum(self) -> TestEnum { _empty }
fn ReceiveInterface(self) -> Temporary<Blob> { fn ReceiveInterface(self) -> Temporary<Blob> {
@ -127,7 +127,7 @@ impl<'a> TestBindingMethods for JSRef<'a, TestBinding> {
} }
fn ReceiveAny(self, _: *mut JSContext) -> JSVal { NullValue() } fn ReceiveAny(self, _: *mut JSContext) -> JSVal { NullValue() }
fn ReceiveUnion(self) -> HTMLElementOrLong { eLong(0) } fn ReceiveUnion(self) -> HTMLElementOrLong { eLong(0) }
fn ReceiveUnion2(self) -> EventOrString { eString("".to_string()) } fn ReceiveUnion2(self) -> EventOrString { eString("".into_string()) }
fn ReceiveNullableBoolean(self) -> Option<bool> { Some(false) } fn ReceiveNullableBoolean(self) -> Option<bool> { Some(false) }
fn ReceiveNullableByte(self) -> Option<i8> { Some(0) } fn ReceiveNullableByte(self) -> Option<i8> { Some(0) }
@ -140,7 +140,7 @@ impl<'a> TestBindingMethods for JSRef<'a, TestBinding> {
fn ReceiveNullableUnsignedLongLong(self) -> Option<u64> { Some(0) } fn ReceiveNullableUnsignedLongLong(self) -> Option<u64> { Some(0) }
fn ReceiveNullableFloat(self) -> Option<f32> { Some(0.) } fn ReceiveNullableFloat(self) -> Option<f32> { Some(0.) }
fn ReceiveNullableDouble(self) -> Option<f64> { Some(0.) } fn ReceiveNullableDouble(self) -> Option<f64> { Some(0.) }
fn ReceiveNullableString(self) -> Option<DOMString> { Some("".to_string()) } fn ReceiveNullableString(self) -> Option<DOMString> { Some("".into_string()) }
fn ReceiveNullableByteString(self) -> Option<ByteString> { Some(ByteString::new(vec!())) } fn ReceiveNullableByteString(self) -> Option<ByteString> { Some(ByteString::new(vec!())) }
fn ReceiveNullableEnum(self) -> Option<TestEnum> { Some(_empty) } fn ReceiveNullableEnum(self) -> Option<TestEnum> { Some(_empty) }
fn ReceiveNullableInterface(self) -> Option<Temporary<Blob>> { fn ReceiveNullableInterface(self) -> Option<Temporary<Blob>> {
@ -148,7 +148,7 @@ impl<'a> TestBindingMethods for JSRef<'a, TestBinding> {
Some(Blob::new(&global.root_ref(), None)) Some(Blob::new(&global.root_ref(), None))
} }
fn ReceiveNullableUnion(self) -> Option<HTMLElementOrLong> { Some(eLong(0)) } fn ReceiveNullableUnion(self) -> Option<HTMLElementOrLong> { Some(eLong(0)) }
fn ReceiveNullableUnion2(self) -> Option<EventOrString> { Some(eString("".to_string())) } fn ReceiveNullableUnion2(self) -> Option<EventOrString> { Some(eString("".into_string())) }
fn PassBoolean(self, _: bool) {} fn PassBoolean(self, _: bool) {}
fn PassByte(self, _: i8) {} fn PassByte(self, _: i8) {}

8
components/script/dom/urlhelper.rs
View file

@ -14,16 +14,16 @@ impl UrlHelper {
pub fn Search(url: &Url) -> DOMString { pub fn Search(url: &Url) -> DOMString {
match url.query { match url.query {
None => "".to_string(), None => "".into_string(),
Some(ref query) if query.as_slice() == "" => "".to_string(), Some(ref query) if query.as_slice() == "" => "".into_string(),
Some(ref query) => format!("?{}", query) Some(ref query) => format!("?{}", query)
} }
} }
pub fn Hash(url: &Url) -> DOMString { pub fn Hash(url: &Url) -> DOMString {
match url.fragment { match url.fragment {
None => "".to_string(), None => "".into_string(),
Some(ref hash) if hash.as_slice() == "" => "".to_string(), Some(ref hash) if hash.as_slice() == "" => "".into_string(),
Some(ref hash) => format!("#{}", hash) Some(ref hash) => format!("#{}", hash)
} }
} }

46
components/script/dom/xmlhttprequest.rs
View file

@ -177,7 +177,7 @@ impl XMLHttpRequest {
timeout: Cell::new(0u32), timeout: Cell::new(0u32),
with_credentials: Cell::new(false), with_credentials: Cell::new(false),
upload: JS::from_rooted(XMLHttpRequestUpload::new(*global)), upload: JS::from_rooted(XMLHttpRequestUpload::new(*global)),
response_url: "".to_string(), response_url: "".into_string(),
status: Cell::new(0), status: Cell::new(0),
status_text: DOMRefCell::new(ByteString::new(vec!())), status_text: DOMRefCell::new(ByteString::new(vec!())),
response: DOMRefCell::new(ByteString::new(vec!())), response: DOMRefCell::new(ByteString::new(vec!())),
@ -542,12 +542,12 @@ impl<'a> XMLHttpRequestMethods for JSRef<'a, XMLHttpRequest> {
// If one of the event handlers below aborts the fetch by calling // If one of the event handlers below aborts the fetch by calling
// abort or open we will need the current generation id to detect it. // abort or open we will need the current generation id to detect it.
let gen_id = self.generation_id.get(); let gen_id = self.generation_id.get();
self.dispatch_response_progress_event("loadstart".to_string()); self.dispatch_response_progress_event("loadstart".into_string());
if self.generation_id.get() != gen_id { if self.generation_id.get() != gen_id {
return Ok(()); return Ok(());
} }
if !self.upload_complete.get() { if !self.upload_complete.get() {
self.dispatch_upload_progress_event("loadstart".to_string(), Some(0)); self.dispatch_upload_progress_event("loadstart".into_string(), Some(0));
if self.generation_id.get() != gen_id { if self.generation_id.get() != gen_id {
return Ok(()); return Ok(());
} }
@ -619,9 +619,9 @@ impl<'a> XMLHttpRequestMethods for JSRef<'a, XMLHttpRequest> {
buf.push_str(format!("{:u}", p).as_slice()); buf.push_str(format!("{:u}", p).as_slice());
}); });
referer_url.serialize_path().map(|ref h| buf.push_str(h.as_slice())); referer_url.serialize_path().map(|ref h| buf.push_str(h.as_slice()));
self.request_headers.borrow_mut().set_raw("Referer".to_string(), vec![buf.into_bytes()]); self.request_headers.borrow_mut().set_raw("Referer".into_string(), vec![buf.into_bytes()]);
}, },
Ok(Some(ref req)) => self.insert_trusted_header("origin".to_string(), Ok(Some(ref req)) => self.insert_trusted_header("origin".into_string(),
format!("{}", req.origin)), format!("{}", req.origin)),
_ => {} _ => {}
} }
@ -721,12 +721,12 @@ impl<'a> XMLHttpRequestMethods for JSRef<'a, XMLHttpRequest> {
if ready_state == XMLHttpRequestState::XHRDone || ready_state == XMLHttpRequestState::Loading { if ready_state == XMLHttpRequestState::XHRDone || ready_state == XMLHttpRequestState::Loading {
self.text_response().to_jsval(cx) self.text_response().to_jsval(cx)
} else { } else {
"".to_string().to_jsval(cx) "".into_string().to_jsval(cx)
} }
}, },
_ if self.ready_state.get() != XMLHttpRequestState::XHRDone => NullValue(), _ if self.ready_state.get() != XMLHttpRequestState::XHRDone => NullValue(),
Json => { Json => {
let decoded = UTF_8.decode(self.response.borrow().as_slice(), DecoderTrap::Replace).unwrap().to_string(); let decoded = UTF_8.decode(self.response.borrow().as_slice(), DecoderTrap::Replace).unwrap().into_string();
let decoded: Vec<u16> = decoded.as_slice().utf16_units().collect(); let decoded: Vec<u16> = decoded.as_slice().utf16_units().collect();
let mut vp = UndefinedValue(); let mut vp = UndefinedValue();
unsafe { unsafe {
@ -748,7 +748,7 @@ impl<'a> XMLHttpRequestMethods for JSRef<'a, XMLHttpRequest> {
_empty | Text => { _empty | Text => {
match self.ready_state.get() { match self.ready_state.get() {
XMLHttpRequestState::Loading | XMLHttpRequestState::XHRDone => Ok(self.text_response()), XMLHttpRequestState::Loading | XMLHttpRequestState::XHRDone => Ok(self.text_response()),
_ => Ok("".to_string()) _ => Ok("".into_string())
} }
}, },
_ => Err(InvalidState) _ => Err(InvalidState)
@ -834,7 +834,7 @@ impl<'a> PrivateXMLHttpRequestHelpers for JSRef<'a, XMLHttpRequest> {
self.ready_state.set(rs); self.ready_state.set(rs);
let global = self.global.root(); let global = self.global.root();
let event = Event::new(global.root_ref(), let event = Event::new(global.root_ref(),
"readystatechange".to_string(), "readystatechange".into_string(),
EventBubbles::DoesNotBubble, EventBubbles::DoesNotBubble,
EventCancelable::Cancelable).root(); EventCancelable::Cancelable).root();
let target: JSRef<EventTarget> = EventTargetCast::from_ref(self); let target: JSRef<EventTarget> = EventTargetCast::from_ref(self);
@ -868,11 +868,11 @@ impl<'a> PrivateXMLHttpRequestHelpers for JSRef<'a, XMLHttpRequest> {
self.upload_complete.set(true); self.upload_complete.set(true);
// Substeps 2-4 // Substeps 2-4
if !self.sync.get() { if !self.sync.get() {
self.dispatch_upload_progress_event("progress".to_string(), None); self.dispatch_upload_progress_event("progress".into_string(), None);
return_if_fetch_was_terminated!(); return_if_fetch_was_terminated!();
self.dispatch_upload_progress_event("load".to_string(), None); self.dispatch_upload_progress_event("load".into_string(), None);
return_if_fetch_was_terminated!(); return_if_fetch_was_terminated!();
self.dispatch_upload_progress_event("loadend".to_string(), None); self.dispatch_upload_progress_event("loadend".into_string(), None);
return_if_fetch_was_terminated!(); return_if_fetch_was_terminated!();
} }
// Part of step 13, send() (processing response) // Part of step 13, send() (processing response)
@ -900,7 +900,7 @@ impl<'a> PrivateXMLHttpRequestHelpers for JSRef<'a, XMLHttpRequest> {
self.change_ready_state(XMLHttpRequestState::Loading); self.change_ready_state(XMLHttpRequestState::Loading);
return_if_fetch_was_terminated!(); return_if_fetch_was_terminated!();
} }
self.dispatch_response_progress_event("progress".to_string()); self.dispatch_response_progress_event("progress".into_string());
} }
}, },
XHRProgress::Done(_) => { XHRProgress::Done(_) => {
@ -916,11 +916,11 @@ impl<'a> PrivateXMLHttpRequestHelpers for JSRef<'a, XMLHttpRequest> {
self.change_ready_state(XMLHttpRequestState::XHRDone); self.change_ready_state(XMLHttpRequestState::XHRDone);
return_if_fetch_was_terminated!(); return_if_fetch_was_terminated!();
// Subsubsteps 10-12 // Subsubsteps 10-12
self.dispatch_response_progress_event("progress".to_string()); self.dispatch_response_progress_event("progress".into_string());
return_if_fetch_was_terminated!(); return_if_fetch_was_terminated!();
self.dispatch_response_progress_event("load".to_string()); self.dispatch_response_progress_event("load".into_string());
return_if_fetch_was_terminated!(); return_if_fetch_was_terminated!();
self.dispatch_response_progress_event("loadend".to_string()); self.dispatch_response_progress_event("loadend".into_string());
}, },
XHRProgress::Errored(_, e) => { XHRProgress::Errored(_, e) => {
self.send_flag.set(false); self.send_flag.set(false);
@ -937,18 +937,18 @@ impl<'a> PrivateXMLHttpRequestHelpers for JSRef<'a, XMLHttpRequest> {
let upload_complete: &Cell<bool> = &self.upload_complete; let upload_complete: &Cell<bool> = &self.upload_complete;
if !upload_complete.get() { if !upload_complete.get() {
upload_complete.set(true); upload_complete.set(true);
self.dispatch_upload_progress_event("progress".to_string(), None); self.dispatch_upload_progress_event("progress".into_string(), None);
return_if_fetch_was_terminated!(); return_if_fetch_was_terminated!();
self.dispatch_upload_progress_event(errormsg.to_string(), None); self.dispatch_upload_progress_event(errormsg.into_string(), None);
return_if_fetch_was_terminated!(); return_if_fetch_was_terminated!();
self.dispatch_upload_progress_event("loadend".to_string(), None); self.dispatch_upload_progress_event("loadend".into_string(), None);
return_if_fetch_was_terminated!(); return_if_fetch_was_terminated!();
} }
self.dispatch_response_progress_event("progress".to_string()); self.dispatch_response_progress_event("progress".into_string());
return_if_fetch_was_terminated!(); return_if_fetch_was_terminated!();
self.dispatch_response_progress_event(errormsg.to_string()); self.dispatch_response_progress_event(errormsg.into_string());
return_if_fetch_was_terminated!(); return_if_fetch_was_terminated!();
self.dispatch_response_progress_event("loadend".to_string()); self.dispatch_response_progress_event("loadend".into_string());
} }
} }
} }
@ -1034,7 +1034,7 @@ impl<'a> PrivateXMLHttpRequestHelpers for JSRef<'a, XMLHttpRequest> {
// According to Simon, decode() should never return an error, so unwrap()ing // According to Simon, decode() should never return an error, so unwrap()ing
// the result should be fine. XXXManishearth have a closer look at this later // the result should be fine. XXXManishearth have a closer look at this later
encoding.decode(self.response.borrow().as_slice(), DecoderTrap::Replace).unwrap().to_string() encoding.decode(self.response.borrow().as_slice(), DecoderTrap::Replace).unwrap().into_string()
} }
fn filter_response_headers(self) -> Headers { fn filter_response_headers(self) -> Headers {
// http://fetch.spec.whatwg.org/#concept-response-header-list // http://fetch.spec.whatwg.org/#concept-response-header-list

18
components/script/script_task.rs
View file

@ -818,7 +818,7 @@ impl ScriptTask {
let jsval = window.evaluate_js_with_result(evalstr); let jsval = window.evaluate_js_with_result(evalstr);
let strval = FromJSValConvertible::from_jsval(self.get_cx(), jsval, let strval = FromJSValConvertible::from_jsval(self.get_cx(), jsval,
StringificationBehavior::Empty); StringificationBehavior::Empty);
(HTMLInput::InputString(strval.unwrap_or("".to_string())), doc_url) (HTMLInput::InputString(strval.unwrap_or("".into_string())), doc_url)
}; };
parse_html(*document, parser_input, &final_url); parse_html(*document, parser_input, &final_url);
@ -839,7 +839,7 @@ impl ScriptTask {
} }
// https://html.spec.whatwg.org/multipage/#the-end step 4 // https://html.spec.whatwg.org/multipage/#the-end step 4
let event = Event::new(GlobalRef::Window(*window), "DOMContentLoaded".to_string(), let event = Event::new(GlobalRef::Window(*window), "DOMContentLoaded".into_string(),
EventBubbles::DoesNotBubble, EventBubbles::DoesNotBubble,
EventCancelable::NotCancelable).root(); EventCancelable::NotCancelable).root();
let doctarget: JSRef<EventTarget> = EventTargetCast::from_ref(*document); let doctarget: JSRef<EventTarget> = EventTargetCast::from_ref(*document);
@ -852,7 +852,7 @@ impl ScriptTask {
// https://html.spec.whatwg.org/multipage/#the-end step 7 // https://html.spec.whatwg.org/multipage/#the-end step 7
document.set_ready_state(DocumentReadyState::Complete); document.set_ready_state(DocumentReadyState::Complete);
let event = Event::new(GlobalRef::Window(*window), "load".to_string(), let event = Event::new(GlobalRef::Window(*window), "load".into_string(),
EventBubbles::DoesNotBubble, EventBubbles::DoesNotBubble,
EventCancelable::NotCancelable).root(); EventCancelable::NotCancelable).root();
let wintarget: JSRef<EventTarget> = EventTargetCast::from_ref(*window); let wintarget: JSRef<EventTarget> = EventTargetCast::from_ref(*window);
@ -974,12 +974,12 @@ impl ScriptTask {
let ev_type = match state { let ev_type = match state {
KeyState::Pressed | KeyState::Repeated => "keydown", KeyState::Pressed | KeyState::Repeated => "keydown",
KeyState::Released => "keyup", KeyState::Released => "keyup",
}.to_string(); }.into_string();
let props = KeyboardEvent::key_properties(key, modifiers); let props = KeyboardEvent::key_properties(key, modifiers);
let keyevent = KeyboardEvent::new(*window, ev_type, true, true, Some(*window), 0, let keyevent = KeyboardEvent::new(*window, ev_type, true, true, Some(*window), 0,
props.key.to_string(), props.code.to_string(), props.key.into_string(), props.code.into_string(),
props.location, is_repeating, is_composing, props.location, is_repeating, is_composing,
ctrl, alt, shift, meta, ctrl, alt, shift, meta,
None, props.key_code).root(); None, props.key_code).root();
@ -990,8 +990,8 @@ impl ScriptTask {
// https://dvcs.w3.org/hg/dom3events/raw-file/tip/html/DOM3-Events.html#keys-cancelable-keys // https://dvcs.w3.org/hg/dom3events/raw-file/tip/html/DOM3-Events.html#keys-cancelable-keys
if state != KeyState::Released && props.is_printable() && !prevented { if state != KeyState::Released && props.is_printable() && !prevented {
// https://dvcs.w3.org/hg/dom3events/raw-file/tip/html/DOM3-Events.html#keypress-event-order // https://dvcs.w3.org/hg/dom3events/raw-file/tip/html/DOM3-Events.html#keypress-event-order
let event = KeyboardEvent::new(*window, "keypress".to_string(), true, true, Some(*window), let event = KeyboardEvent::new(*window, "keypress".into_string(), true, true, Some(*window),
0, props.key.to_string(), props.code.to_string(), 0, props.key.into_string(), props.code.into_string(),
props.location, is_repeating, is_composing, props.location, is_repeating, is_composing,
ctrl, alt, shift, meta, ctrl, alt, shift, meta,
props.char_code, 0).root(); props.char_code, 0).root();
@ -1075,7 +1075,7 @@ impl ScriptTask {
// http://dev.w3.org/csswg/cssom-view/#resizing-viewports // http://dev.w3.org/csswg/cssom-view/#resizing-viewports
// https://dvcs.w3.org/hg/dom3events/raw-file/tip/html/DOM3-Events.html#event-type-resize // https://dvcs.w3.org/hg/dom3events/raw-file/tip/html/DOM3-Events.html#event-type-resize
let uievent = UIEvent::new(window.clone(), let uievent = UIEvent::new(window.clone(),
"resize".to_string(), false, "resize".into_string(), false,
false, Some(window.clone()), false, Some(window.clone()),
0i32).root(); 0i32).root();
let event: JSRef<Event> = EventCast::from_ref(*uievent); let event: JSRef<Event> = EventCast::from_ref(*uievent);
@ -1126,7 +1126,7 @@ impl ScriptTask {
let event = let event =
Event::new(GlobalRef::Window(*window), Event::new(GlobalRef::Window(*window),
"click".to_string(), "click".into_string(),
EventBubbles::Bubbles, EventBubbles::Bubbles,
EventCancelable::Cancelable).root(); EventCancelable::Cancelable).root();
// https://dvcs.w3.org/hg/dom3events/raw-file/tip/html/DOM3-Events.html#trusted-events // https://dvcs.w3.org/hg/dom3events/raw-file/tip/html/DOM3-Events.html#trusted-events

10
components/script/textinput.rs
View file

@ -99,7 +99,7 @@ impl TextInput {
-1 -1
}, true); }, true);
} }
self.replace_selection("".to_string()); self.replace_selection("".into_string());
} }
/// Insert a character at the current editing point /// Insert a character at the current editing point
@ -132,12 +132,12 @@ impl TextInput {
let lines_suffix = self.lines.slice(end.line + 1, self.lines.len()); let lines_suffix = self.lines.slice(end.line + 1, self.lines.len());
let mut insert_lines = if self.multiline { let mut insert_lines = if self.multiline {
insert.as_slice().split('\n').map(|s| s.to_string()).collect() insert.as_slice().split('\n').map(|s| s.into_string()).collect()
} else { } else {
vec!(insert) vec!(insert)
}; };
let mut new_line = prefix.to_string(); let mut new_line = prefix.into_string();
new_line.push_str(insert_lines[0].as_slice()); new_line.push_str(insert_lines[0].as_slice());
insert_lines[0] = new_line; insert_lines[0] = new_line;
@ -319,7 +319,7 @@ impl TextInput {
/// Get the current contents of the text input. Multiple lines are joined by \n. /// Get the current contents of the text input. Multiple lines are joined by \n.
pub fn get_content(&self) -> DOMString { pub fn get_content(&self) -> DOMString {
let mut content = "".to_string(); let mut content = "".into_string();
for (i, line) in self.lines.iter().enumerate() { for (i, line) in self.lines.iter().enumerate() {
content.push_str(line.as_slice()); content.push_str(line.as_slice());
if i < self.lines.len() - 1 { if i < self.lines.len() - 1 {
@ -333,7 +333,7 @@ impl TextInput {
/// any \n encountered will be stripped and force a new logical line. /// any \n encountered will be stripped and force a new logical line.
pub fn set_content(&mut self, content: DOMString) { pub fn set_content(&mut self, content: DOMString) {
self.lines = if self.multiline { self.lines = if self.multiline {
content.as_slice().split('\n').map(|s| s.to_string()).collect() content.as_slice().split('\n').map(|s| s.into_string()).collect()
} else { } else {
vec!(content) vec!(content)
}; };

4
components/servo/main.rs
View file

@ -58,8 +58,8 @@ android_start!(main)
#[cfg(target_os="android")] #[cfg(target_os="android")]
fn get_args() -> Vec<String> { fn get_args() -> Vec<String> {
vec![ vec![
"servo".to_string(), "servo".into_string(),
"http://en.wikipedia.org/wiki/Rust".to_string() "http://en.wikipedia.org/wiki/Rust".into_string()
] ]
} }

252
components/style/media_queries.rs
View file

@ -343,152 +343,152 @@ mod tests {
let ss = Stylesheet::from_str(css, url, StylesheetOrigin::Author); let ss = Stylesheet::from_str(css, url, StylesheetOrigin::Author);
let mut rule_count: int = 0; let mut rule_count: int = 0;
iter_stylesheet_style_rules(&ss, device, |_| rule_count += 1); iter_stylesheet_style_rules(&ss, device, |_| rule_count += 1);
assert!(rule_count == expected_rule_count, css.to_string()); assert!(rule_count == expected_rule_count, css.into_string());
} }
#[test] #[test]
fn test_mq_empty() { fn test_mq_empty() {
test_media_rule("@media { }", |list, css| { test_media_rule("@media { }", |list, css| {
assert!(list.media_queries.len() == 1, css.to_string()); assert!(list.media_queries.len() == 1, css.into_string());
let q = &list.media_queries[0]; let q = &list.media_queries[0];
assert!(q.qualifier == None, css.to_string()); assert!(q.qualifier == None, css.into_string());
assert!(q.media_type == MediaQueryType::All, css.to_string()); assert!(q.media_type == MediaQueryType::All, css.into_string());
assert!(q.expressions.len() == 0, css.to_string()); assert!(q.expressions.len() == 0, css.into_string());
}); });
} }
#[test] #[test]
fn test_mq_screen() { fn test_mq_screen() {
test_media_rule("@media screen { }", |list, css| { test_media_rule("@media screen { }", |list, css| {
assert!(list.media_queries.len() == 1, css.to_string()); assert!(list.media_queries.len() == 1, css.into_string());
let q = &list.media_queries[0]; let q = &list.media_queries[0];
assert!(q.qualifier == None, css.to_string()); assert!(q.qualifier == None, css.into_string());
assert!(q.media_type == MediaQueryType::MediaType(MediaType::Screen), css.to_string()); assert!(q.media_type == MediaQueryType::MediaType(MediaType::Screen), css.into_string());
assert!(q.expressions.len() == 0, css.to_string()); assert!(q.expressions.len() == 0, css.into_string());
}); });
test_media_rule("@media only screen { }", |list, css| { test_media_rule("@media only screen { }", |list, css| {
assert!(list.media_queries.len() == 1, css.to_string()); assert!(list.media_queries.len() == 1, css.into_string());
let q = &list.media_queries[0]; let q = &list.media_queries[0];
assert!(q.qualifier == Some(Qualifier::Only), css.to_string()); assert!(q.qualifier == Some(Qualifier::Only), css.into_string());
assert!(q.media_type == MediaQueryType::MediaType(MediaType::Screen), css.to_string()); assert!(q.media_type == MediaQueryType::MediaType(MediaType::Screen), css.into_string());
assert!(q.expressions.len() == 0, css.to_string()); assert!(q.expressions.len() == 0, css.into_string());
}); });
test_media_rule("@media not screen { }", |list, css| { test_media_rule("@media not screen { }", |list, css| {
assert!(list.media_queries.len() == 1, css.to_string()); assert!(list.media_queries.len() == 1, css.into_string());
let q = &list.media_queries[0]; let q = &list.media_queries[0];
assert!(q.qualifier == Some(Qualifier::Not), css.to_string()); assert!(q.qualifier == Some(Qualifier::Not), css.into_string());
assert!(q.media_type == MediaQueryType::MediaType(MediaType::Screen), css.to_string()); assert!(q.media_type == MediaQueryType::MediaType(MediaType::Screen), css.into_string());
assert!(q.expressions.len() == 0, css.to_string()); assert!(q.expressions.len() == 0, css.into_string());
}); });
} }
#[test] #[test]
fn test_mq_print() { fn test_mq_print() {
test_media_rule("@media print { }", |list, css| { test_media_rule("@media print { }", |list, css| {
assert!(list.media_queries.len() == 1, css.to_string()); assert!(list.media_queries.len() == 1, css.into_string());
let q = &list.media_queries[0]; let q = &list.media_queries[0];
assert!(q.qualifier == None, css.to_string()); assert!(q.qualifier == None, css.into_string());
assert!(q.media_type == MediaQueryType::MediaType(MediaType::Print), css.to_string()); assert!(q.media_type == MediaQueryType::MediaType(MediaType::Print), css.into_string());
assert!(q.expressions.len() == 0, css.to_string()); assert!(q.expressions.len() == 0, css.into_string());
}); });
test_media_rule("@media only print { }", |list, css| { test_media_rule("@media only print { }", |list, css| {
assert!(list.media_queries.len() == 1, css.to_string()); assert!(list.media_queries.len() == 1, css.into_string());
let q = &list.media_queries[0]; let q = &list.media_queries[0];
assert!(q.qualifier == Some(Qualifier::Only), css.to_string()); assert!(q.qualifier == Some(Qualifier::Only), css.into_string());
assert!(q.media_type == MediaQueryType::MediaType(MediaType::Print), css.to_string()); assert!(q.media_type == MediaQueryType::MediaType(MediaType::Print), css.into_string());
assert!(q.expressions.len() == 0, css.to_string()); assert!(q.expressions.len() == 0, css.into_string());
}); });
test_media_rule("@media not print { }", |list, css| { test_media_rule("@media not print { }", |list, css| {
assert!(list.media_queries.len() == 1, css.to_string()); assert!(list.media_queries.len() == 1, css.into_string());
let q = &list.media_queries[0]; let q = &list.media_queries[0];
assert!(q.qualifier == Some(Qualifier::Not), css.to_string()); assert!(q.qualifier == Some(Qualifier::Not), css.into_string());
assert!(q.media_type == MediaQueryType::MediaType(MediaType::Print), css.to_string()); assert!(q.media_type == MediaQueryType::MediaType(MediaType::Print), css.into_string());
assert!(q.expressions.len() == 0, css.to_string()); assert!(q.expressions.len() == 0, css.into_string());
}); });
} }
#[test] #[test]
fn test_mq_unknown() { fn test_mq_unknown() {
test_media_rule("@media fridge { }", |list, css| { test_media_rule("@media fridge { }", |list, css| {
assert!(list.media_queries.len() == 1, css.to_string()); assert!(list.media_queries.len() == 1, css.into_string());
let q = &list.media_queries[0]; let q = &list.media_queries[0];
assert!(q.qualifier == None, css.to_string()); assert!(q.qualifier == None, css.into_string());
assert!(q.media_type == MediaQueryType::MediaType(MediaType::Unknown), css.to_string()); assert!(q.media_type == MediaQueryType::MediaType(MediaType::Unknown), css.into_string());
assert!(q.expressions.len() == 0, css.to_string()); assert!(q.expressions.len() == 0, css.into_string());
}); });
test_media_rule("@media only glass { }", |list, css| { test_media_rule("@media only glass { }", |list, css| {
assert!(list.media_queries.len() == 1, css.to_string()); assert!(list.media_queries.len() == 1, css.into_string());
let q = &list.media_queries[0]; let q = &list.media_queries[0];
assert!(q.qualifier == Some(Qualifier::Only), css.to_string()); assert!(q.qualifier == Some(Qualifier::Only), css.into_string());
assert!(q.media_type == MediaQueryType::MediaType(MediaType::Unknown), css.to_string()); assert!(q.media_type == MediaQueryType::MediaType(MediaType::Unknown), css.into_string());
assert!(q.expressions.len() == 0, css.to_string()); assert!(q.expressions.len() == 0, css.into_string());
}); });
test_media_rule("@media not wood { }", |list, css| { test_media_rule("@media not wood { }", |list, css| {
assert!(list.media_queries.len() == 1, css.to_string()); assert!(list.media_queries.len() == 1, css.into_string());
let q = &list.media_queries[0]; let q = &list.media_queries[0];
assert!(q.qualifier == Some(Qualifier::Not), css.to_string()); assert!(q.qualifier == Some(Qualifier::Not), css.into_string());
assert!(q.media_type == MediaQueryType::MediaType(MediaType::Unknown), css.to_string()); assert!(q.media_type == MediaQueryType::MediaType(MediaType::Unknown), css.into_string());
assert!(q.expressions.len() == 0, css.to_string()); assert!(q.expressions.len() == 0, css.into_string());
}); });
} }
#[test] #[test]
fn test_mq_all() { fn test_mq_all() {
test_media_rule("@media all { }", |list, css| { test_media_rule("@media all { }", |list, css| {
assert!(list.media_queries.len() == 1, css.to_string()); assert!(list.media_queries.len() == 1, css.into_string());
let q = &list.media_queries[0]; let q = &list.media_queries[0];
assert!(q.qualifier == None, css.to_string()); assert!(q.qualifier == None, css.into_string());
assert!(q.media_type == MediaQueryType::All, css.to_string()); assert!(q.media_type == MediaQueryType::All, css.into_string());
assert!(q.expressions.len() == 0, css.to_string()); assert!(q.expressions.len() == 0, css.into_string());
}); });
test_media_rule("@media only all { }", |list, css| { test_media_rule("@media only all { }", |list, css| {
assert!(list.media_queries.len() == 1, css.to_string()); assert!(list.media_queries.len() == 1, css.into_string());
let q = &list.media_queries[0]; let q = &list.media_queries[0];
assert!(q.qualifier == Some(Qualifier::Only), css.to_string()); assert!(q.qualifier == Some(Qualifier::Only), css.into_string());
assert!(q.media_type == MediaQueryType::All, css.to_string()); assert!(q.media_type == MediaQueryType::All, css.into_string());
assert!(q.expressions.len() == 0, css.to_string()); assert!(q.expressions.len() == 0, css.into_string());
}); });
test_media_rule("@media not all { }", |list, css| { test_media_rule("@media not all { }", |list, css| {
assert!(list.media_queries.len() == 1, css.to_string()); assert!(list.media_queries.len() == 1, css.into_string());
let q = &list.media_queries[0]; let q = &list.media_queries[0];
assert!(q.qualifier == Some(Qualifier::Not), css.to_string()); assert!(q.qualifier == Some(Qualifier::Not), css.into_string());
assert!(q.media_type == MediaQueryType::All, css.to_string()); assert!(q.media_type == MediaQueryType::All, css.into_string());
assert!(q.expressions.len() == 0, css.to_string()); assert!(q.expressions.len() == 0, css.into_string());
}); });
} }
#[test] #[test]
fn test_mq_or() { fn test_mq_or() {
test_media_rule("@media screen, print { }", |list, css| { test_media_rule("@media screen, print { }", |list, css| {
assert!(list.media_queries.len() == 2, css.to_string()); assert!(list.media_queries.len() == 2, css.into_string());
let q0 = &list.media_queries[0]; let q0 = &list.media_queries[0];
assert!(q0.qualifier == None, css.to_string()); assert!(q0.qualifier == None, css.into_string());
assert!(q0.media_type == MediaQueryType::MediaType(MediaType::Screen), css.to_string()); assert!(q0.media_type == MediaQueryType::MediaType(MediaType::Screen), css.into_string());
assert!(q0.expressions.len() == 0, css.to_string()); assert!(q0.expressions.len() == 0, css.into_string());
let q1 = &list.media_queries[1]; let q1 = &list.media_queries[1];
assert!(q1.qualifier == None, css.to_string()); assert!(q1.qualifier == None, css.into_string());
assert!(q1.media_type == MediaQueryType::MediaType(MediaType::Print), css.to_string()); assert!(q1.media_type == MediaQueryType::MediaType(MediaType::Print), css.into_string());
assert!(q1.expressions.len() == 0, css.to_string()); assert!(q1.expressions.len() == 0, css.into_string());
}); });
} }
#[test] #[test]
fn test_mq_default_expressions() { fn test_mq_default_expressions() {
test_media_rule("@media (min-width: 100px) { }", |list, css| { test_media_rule("@media (min-width: 100px) { }", |list, css| {
assert!(list.media_queries.len() == 1, css.to_string()); assert!(list.media_queries.len() == 1, css.into_string());
let q = &list.media_queries[0]; let q = &list.media_queries[0];
assert!(q.qualifier == None, css.to_string()); assert!(q.qualifier == None, css.into_string());
assert!(q.media_type == MediaQueryType::All, css.to_string()); assert!(q.media_type == MediaQueryType::All, css.into_string());
assert!(q.expressions.len() == 1, css.to_string()); assert!(q.expressions.len() == 1, css.into_string());
match q.expressions[0] { match q.expressions[0] {
Expression::Width(Range::Min(w)) => assert!(w == Au::from_px(100)), Expression::Width(Range::Min(w)) => assert!(w == Au::from_px(100)),
_ => panic!("wrong expression type"), _ => panic!("wrong expression type"),
@ -496,11 +496,11 @@ mod tests {
}); });
test_media_rule("@media (max-width: 43px) { }", |list, css| { test_media_rule("@media (max-width: 43px) { }", |list, css| {
assert!(list.media_queries.len() == 1, css.to_string()); assert!(list.media_queries.len() == 1, css.into_string());
let q = &list.media_queries[0]; let q = &list.media_queries[0];
assert!(q.qualifier == None, css.to_string()); assert!(q.qualifier == None, css.into_string());
assert!(q.media_type == MediaQueryType::All, css.to_string()); assert!(q.media_type == MediaQueryType::All, css.into_string());
assert!(q.expressions.len() == 1, css.to_string()); assert!(q.expressions.len() == 1, css.into_string());
match q.expressions[0] { match q.expressions[0] {
Expression::Width(Range::Max(w)) => assert!(w == Au::from_px(43)), Expression::Width(Range::Max(w)) => assert!(w == Au::from_px(43)),
_ => panic!("wrong expression type"), _ => panic!("wrong expression type"),
@ -511,11 +511,11 @@ mod tests {
#[test] #[test]
fn test_mq_expressions() { fn test_mq_expressions() {
test_media_rule("@media screen and (min-width: 100px) { }", |list, css| { test_media_rule("@media screen and (min-width: 100px) { }", |list, css| {
assert!(list.media_queries.len() == 1, css.to_string()); assert!(list.media_queries.len() == 1, css.into_string());
let q = &list.media_queries[0]; let q = &list.media_queries[0];
assert!(q.qualifier == None, css.to_string()); assert!(q.qualifier == None, css.into_string());
assert!(q.media_type == MediaQueryType::MediaType(MediaType::Screen), css.to_string()); assert!(q.media_type == MediaQueryType::MediaType(MediaType::Screen), css.into_string());
assert!(q.expressions.len() == 1, css.to_string()); assert!(q.expressions.len() == 1, css.into_string());
match q.expressions[0] { match q.expressions[0] {
Expression::Width(Range::Min(w)) => assert!(w == Au::from_px(100)), Expression::Width(Range::Min(w)) => assert!(w == Au::from_px(100)),
_ => panic!("wrong expression type"), _ => panic!("wrong expression type"),
@ -523,11 +523,11 @@ mod tests {
}); });
test_media_rule("@media print and (max-width: 43px) { }", |list, css| { test_media_rule("@media print and (max-width: 43px) { }", |list, css| {
assert!(list.media_queries.len() == 1, css.to_string()); assert!(list.media_queries.len() == 1, css.into_string());
let q = &list.media_queries[0]; let q = &list.media_queries[0];
assert!(q.qualifier == None, css.to_string()); assert!(q.qualifier == None, css.into_string());
assert!(q.media_type == MediaQueryType::MediaType(MediaType::Print), css.to_string()); assert!(q.media_type == MediaQueryType::MediaType(MediaType::Print), css.into_string());
assert!(q.expressions.len() == 1, css.to_string()); assert!(q.expressions.len() == 1, css.into_string());
match q.expressions[0] { match q.expressions[0] {
Expression::Width(Range::Max(w)) => assert!(w == Au::from_px(43)), Expression::Width(Range::Max(w)) => assert!(w == Au::from_px(43)),
_ => panic!("wrong expression type"), _ => panic!("wrong expression type"),
@ -535,11 +535,11 @@ mod tests {
}); });
test_media_rule("@media fridge and (max-width: 52px) { }", |list, css| { test_media_rule("@media fridge and (max-width: 52px) { }", |list, css| {
assert!(list.media_queries.len() == 1, css.to_string()); assert!(list.media_queries.len() == 1, css.into_string());
let q = &list.media_queries[0]; let q = &list.media_queries[0];
assert!(q.qualifier == None, css.to_string()); assert!(q.qualifier == None, css.into_string());
assert!(q.media_type == MediaQueryType::MediaType(MediaType::Unknown), css.to_string()); assert!(q.media_type == MediaQueryType::MediaType(MediaType::Unknown), css.into_string());
assert!(q.expressions.len() == 1, css.to_string()); assert!(q.expressions.len() == 1, css.into_string());
match q.expressions[0] { match q.expressions[0] {
Expression::Width(Range::Max(w)) => assert!(w == Au::from_px(52)), Expression::Width(Range::Max(w)) => assert!(w == Au::from_px(52)),
_ => panic!("wrong expression type"), _ => panic!("wrong expression type"),
@ -550,11 +550,11 @@ mod tests {
#[test] #[test]
fn test_mq_multiple_expressions() { fn test_mq_multiple_expressions() {
test_media_rule("@media (min-width: 100px) and (max-width: 200px) { }", |list, css| { test_media_rule("@media (min-width: 100px) and (max-width: 200px) { }", |list, css| {
assert!(list.media_queries.len() == 1, css.to_string()); assert!(list.media_queries.len() == 1, css.into_string());
let q = &list.media_queries[0]; let q = &list.media_queries[0];
assert!(q.qualifier == None, css.to_string()); assert!(q.qualifier == None, css.into_string());
assert!(q.media_type == MediaQueryType::All, css.to_string()); assert!(q.media_type == MediaQueryType::All, css.into_string());
assert!(q.expressions.len() == 2, css.to_string()); assert!(q.expressions.len() == 2, css.into_string());
match q.expressions[0] { match q.expressions[0] {
Expression::Width(Range::Min(w)) => assert!(w == Au::from_px(100)), Expression::Width(Range::Min(w)) => assert!(w == Au::from_px(100)),
_ => panic!("wrong expression type"), _ => panic!("wrong expression type"),
@ -566,11 +566,11 @@ mod tests {
}); });
test_media_rule("@media not screen and (min-width: 100px) and (max-width: 200px) { }", |list, css| { test_media_rule("@media not screen and (min-width: 100px) and (max-width: 200px) { }", |list, css| {
assert!(list.media_queries.len() == 1, css.to_string()); assert!(list.media_queries.len() == 1, css.into_string());
let q = &list.media_queries[0]; let q = &list.media_queries[0];
assert!(q.qualifier == Some(Qualifier::Not), css.to_string()); assert!(q.qualifier == Some(Qualifier::Not), css.into_string());
assert!(q.media_type == MediaQueryType::MediaType(MediaType::Screen), css.to_string()); assert!(q.media_type == MediaQueryType::MediaType(MediaType::Screen), css.into_string());
assert!(q.expressions.len() == 2, css.to_string()); assert!(q.expressions.len() == 2, css.into_string());
match q.expressions[0] { match q.expressions[0] {
Expression::Width(Range::Min(w)) => assert!(w == Au::from_px(100)), Expression::Width(Range::Min(w)) => assert!(w == Au::from_px(100)),
_ => panic!("wrong expression type"), _ => panic!("wrong expression type"),
@ -585,75 +585,75 @@ mod tests {
#[test] #[test]
fn test_mq_malformed_expressions() { fn test_mq_malformed_expressions() {
test_media_rule("@media (min-width: 100blah) and (max-width: 200px) { }", |list, css| { test_media_rule("@media (min-width: 100blah) and (max-width: 200px) { }", |list, css| {
assert!(list.media_queries.len() == 1, css.to_string()); assert!(list.media_queries.len() == 1, css.into_string());
let q = &list.media_queries[0]; let q = &list.media_queries[0];
assert!(q.qualifier == Some(Qualifier::Not), css.to_string()); assert!(q.qualifier == Some(Qualifier::Not), css.into_string());
assert!(q.media_type == MediaQueryType::All, css.to_string()); assert!(q.media_type == MediaQueryType::All, css.into_string());
assert!(q.expressions.len() == 0, css.to_string()); assert!(q.expressions.len() == 0, css.into_string());
}); });
test_media_rule("@media screen and (height: 200px) { }", |list, css| { test_media_rule("@media screen and (height: 200px) { }", |list, css| {
assert!(list.media_queries.len() == 1, css.to_string()); assert!(list.media_queries.len() == 1, css.into_string());
let q = &list.media_queries[0]; let q = &list.media_queries[0];
assert!(q.qualifier == Some(Qualifier::Not), css.to_string()); assert!(q.qualifier == Some(Qualifier::Not), css.into_string());
assert!(q.media_type == MediaQueryType::All, css.to_string()); assert!(q.media_type == MediaQueryType::All, css.into_string());
assert!(q.expressions.len() == 0, css.to_string()); assert!(q.expressions.len() == 0, css.into_string());
}); });
test_media_rule("@media (min-width: 30em foo bar) {}", |list, css| { test_media_rule("@media (min-width: 30em foo bar) {}", |list, css| {
assert!(list.media_queries.len() == 1, css.to_string()); assert!(list.media_queries.len() == 1, css.into_string());
let q = &list.media_queries[0]; let q = &list.media_queries[0];
assert!(q.qualifier == Some(Qualifier::Not), css.to_string()); assert!(q.qualifier == Some(Qualifier::Not), css.into_string());
assert!(q.media_type == MediaQueryType::All, css.to_string()); assert!(q.media_type == MediaQueryType::All, css.into_string());
assert!(q.expressions.len() == 0, css.to_string()); assert!(q.expressions.len() == 0, css.into_string());
}); });
test_media_rule("@media not {}", |list, css| { test_media_rule("@media not {}", |list, css| {
assert!(list.media_queries.len() == 1, css.to_string()); assert!(list.media_queries.len() == 1, css.into_string());
let q = &list.media_queries[0]; let q = &list.media_queries[0];
assert!(q.qualifier == Some(Qualifier::Not), css.to_string()); assert!(q.qualifier == Some(Qualifier::Not), css.into_string());
assert!(q.media_type == MediaQueryType::All, css.to_string()); assert!(q.media_type == MediaQueryType::All, css.into_string());
assert!(q.expressions.len() == 0, css.to_string()); assert!(q.expressions.len() == 0, css.into_string());
}); });
test_media_rule("@media not (min-width: 300px) {}", |list, css| { test_media_rule("@media not (min-width: 300px) {}", |list, css| {
assert!(list.media_queries.len() == 1, css.to_string()); assert!(list.media_queries.len() == 1, css.into_string());
let q = &list.media_queries[0]; let q = &list.media_queries[0];
assert!(q.qualifier == Some(Qualifier::Not), css.to_string()); assert!(q.qualifier == Some(Qualifier::Not), css.into_string());
assert!(q.media_type == MediaQueryType::All, css.to_string()); assert!(q.media_type == MediaQueryType::All, css.into_string());
assert!(q.expressions.len() == 0, css.to_string()); assert!(q.expressions.len() == 0, css.into_string());
}); });
test_media_rule("@media , {}", |list, css| { test_media_rule("@media , {}", |list, css| {
assert!(list.media_queries.len() == 1, css.to_string()); assert!(list.media_queries.len() == 1, css.into_string());
let q = &list.media_queries[0]; let q = &list.media_queries[0];
assert!(q.qualifier == Some(Qualifier::Not), css.to_string()); assert!(q.qualifier == Some(Qualifier::Not), css.into_string());
assert!(q.media_type == MediaQueryType::All, css.to_string()); assert!(q.media_type == MediaQueryType::All, css.into_string());
assert!(q.expressions.len() == 0, css.to_string()); assert!(q.expressions.len() == 0, css.into_string());
}); });
test_media_rule("@media screen 4px, print {}", |list, css| { test_media_rule("@media screen 4px, print {}", |list, css| {
assert!(list.media_queries.len() == 2, css.to_string()); assert!(list.media_queries.len() == 2, css.into_string());
let q0 = &list.media_queries[0]; let q0 = &list.media_queries[0];
assert!(q0.qualifier == Some(Qualifier::Not), css.to_string()); assert!(q0.qualifier == Some(Qualifier::Not), css.into_string());
assert!(q0.media_type == MediaQueryType::All, css.to_string()); assert!(q0.media_type == MediaQueryType::All, css.into_string());
assert!(q0.expressions.len() == 0, css.to_string()); assert!(q0.expressions.len() == 0, css.into_string());
let q1 = &list.media_queries[1]; let q1 = &list.media_queries[1];
assert!(q1.qualifier == None, css.to_string()); assert!(q1.qualifier == None, css.into_string());
assert!(q1.media_type == MediaQueryType::MediaType(MediaType::Print), css.to_string()); assert!(q1.media_type == MediaQueryType::MediaType(MediaType::Print), css.into_string());
assert!(q1.expressions.len() == 0, css.to_string()); assert!(q1.expressions.len() == 0, css.into_string());
}); });
test_media_rule("@media screen, {}", |list, css| { test_media_rule("@media screen, {}", |list, css| {
assert!(list.media_queries.len() == 2, css.to_string()); assert!(list.media_queries.len() == 2, css.into_string());
let q0 = &list.media_queries[0]; let q0 = &list.media_queries[0];
assert!(q0.qualifier == None, css.to_string()); assert!(q0.qualifier == None, css.into_string());
assert!(q0.media_type == MediaQueryType::MediaType(MediaType::Screen), css.to_string()); assert!(q0.media_type == MediaQueryType::MediaType(MediaType::Screen), css.into_string());
assert!(q0.expressions.len() == 0, css.to_string()); assert!(q0.expressions.len() == 0, css.into_string());
let q1 = &list.media_queries[1]; let q1 = &list.media_queries[1];
assert!(q1.qualifier == Some(Qualifier::Not), css.to_string()); assert!(q1.qualifier == Some(Qualifier::Not), css.into_string());
assert!(q1.media_type == MediaQueryType::All, css.to_string()); assert!(q1.media_type == MediaQueryType::All, css.into_string());
assert!(q1.expressions.len() == 0, css.to_string()); assert!(q1.expressions.len() == 0, css.into_string());
}); });
} }

2
components/style/properties/mod.rs.mako
View file

@ -1081,7 +1081,7 @@ pub mod longhands {
#[inline] #[inline]
pub fn get_initial_value() -> computed_value::T { pub fn get_initial_value() -> computed_value::T {
vec![FontFamily::FamilyName("serif".to_string())] vec![FontFamily::FamilyName("serif".into_string())]
} }
/// <familiy-name># /// <familiy-name>#
/// <familiy-name> = <string> | [ <ident>+ ] /// <familiy-name> = <string> | [ <ident>+ ]