diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-01-20 07:54:46 -0700 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-01-20 07:54:46 -0700 |
| commit | 94ebc7c32d5ce58ada3f9d8ffdb60cc025eb5997 (patch) | |
| tree | d4982abff1dae6119889edb12e7cc7623105396b /components/layout/construct.rs | |
| parent | 89645391bf42edd9977ed1b6f9b430ad786f209e (diff) | |
| parent | 01ed338746ae71493984259335197e6b66daec45 (diff) | |
| download | servo-94ebc7c32d5ce58ada3f9d8ffdb60cc025eb5997.tar.gz servo-94ebc7c32d5ce58ada3f9d8ffdb60cc025eb5997.zip | |
auto merge of #4682 : servo/servo/to_owned, r=jdm
into_string has been removed from Rust.
Diffstat (limited to 'components/layout/construct.rs')
| -rw-r--r-- | components/layout/construct.rs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/components/layout/construct.rs b/components/layout/construct.rs index eb90fbf734e..742fb2ebb3e 100644 --- a/components/layout/construct.rs +++ b/components/layout/construct.rs @@ -50,6 +50,7 @@ use script::dom::htmlelement::HTMLElementTypeId; use script::dom::htmlobjectelement::is_image_data; use script::dom::node::NodeTypeId; use servo_util::opts; +use std::borrow::ToOwned; use std::collections::DList; use std::mem; use std::sync::atomic::Relaxed; @@ -455,7 +456,7 @@ impl<'a> FlowConstructor<'a> { // Add whitespace results. They will be stripped out later on when // between block elements, and retained when between inline elements. let fragment_info = - SpecificFragmentInfo::UnscannedText(UnscannedTextFragmentInfo::from_text(" ".into_string())); + SpecificFragmentInfo::UnscannedText(UnscannedTextFragmentInfo::from_text(" ".to_owned())); let fragment = Fragment::from_opaque_node_and_style(whitespace_node, whitespace_style, whitespace_damage, @@ -652,7 +653,7 @@ impl<'a> FlowConstructor<'a> { whitespace_damage)) => { // Instantiate the whitespace fragment. let fragment_info = SpecificFragmentInfo::UnscannedText(UnscannedTextFragmentInfo::from_text( - " ".into_string())); + " ".to_owned())); let fragment = Fragment::from_opaque_node_and_style(whitespace_node, whitespace_style, whitespace_damage, @@ -986,7 +987,7 @@ impl<'a> FlowConstructor<'a> { .list_style_type) { None => None, Some(text) => { - let text = text.into_string(); + let text = text.to_owned(); let mut unscanned_marker_fragments = DList::new(); unscanned_marker_fragments.push_back(Fragment::new_from_specific_info( node, |