Auto merge of #7052 - mbrubeck:rollup, r=mbrubeck

Rollup of 2 pull requests

- Successful merges: #7014, #7015
- Failed merges:

components/gfx/display_list/mod.rs

@@ -824,7 +824,7 @@ pub struct TextDisplayItem {
 
     /// The text run.
     #[ignore_heap_size_of = "Because it is non-owning"]
-    pub text_run: Arc<Box<TextRun>>,
+    pub text_run: Arc<TextRun>,
 
     /// The range of text within the text run.
     pub range: Range<CharIndex>,

components/gfx/paint_context.rs

@@ -1264,7 +1264,7 @@ impl ToRadiiPx for BorderRadii<Au> {
 trait ScaledFontExtensionMethods {
     fn draw_text(&self,
                  draw_target: &DrawTarget,
-                 run: &Box<TextRun>,
+                 run: &TextRun,
                  range: &Range<CharIndex>,
                  baseline_origin: Point2D<Au>,
                  color: Color,
@@ -1274,7 +1274,7 @@ trait ScaledFontExtensionMethods {
 impl ScaledFontExtensionMethods for ScaledFont {
     fn draw_text(&self,
                  draw_target: &DrawTarget,
-                 run: &Box<TextRun>,
+                 run: &TextRun,
                  range: &Range<CharIndex>,
                  baseline_origin: Point2D<Au>,
                  color: Color,

components/layout/fragment.rs

@@ -626,7 +626,7 @@ impl IframeFragmentInfo {
 #[derive(Clone)]
 pub struct ScannedTextFragmentInfo {
     /// The text run that this represents.
-    pub run: Arc<Box<TextRun>>,
+    pub run: Arc<TextRun>,
 
     /// The intrinsic size of the text fragment.
     pub content_size: LogicalSize<Au>,
@@ -646,7 +646,7 @@ pub struct ScannedTextFragmentInfo {
 
 impl ScannedTextFragmentInfo {
     /// Creates the information specific to a scanned text fragment from a range and a text run.
-    pub fn new(run: Arc<Box<TextRun>>,
+    pub fn new(run: Arc<TextRun>,
                range: Range<CharIndex>,
                content_size: LogicalSize<Au>,
                requires_line_break_afterward_if_wrapping_on_newlines: bool)
@@ -689,7 +689,7 @@ pub struct SplitResult {
     /// The part of the fragment that goes on the second line.
     pub inline_end: Option<SplitInfo>,
     /// The text run which is being split.
-    pub text_run: Arc<Box<TextRun>>,
+    pub text_run: Arc<TextRun>,
 }
 
 /// Describes how a fragment should be truncated.
@@ -697,7 +697,7 @@ pub struct TruncationResult {
     /// The part of the fragment remaining after truncation.
     pub split: SplitInfo,
     /// The text run which is being truncated.
-    pub text_run: Arc<Box<TextRun>>,
+    pub text_run: Arc<TextRun>,
 }
 
 /// Data for an unscanned text fragment. Unscanned text fragments are the results of flow
@@ -705,10 +705,7 @@ pub struct TruncationResult {
 #[derive(Clone)]
 pub struct UnscannedTextFragmentInfo {
     /// The text inside the fragment.
-    ///
+    pub text: Box<str>,
-    /// FIXME(pcwalton): Is there something more clever we can do here that avoids the double
-    /// indirection while not penalizing all fragments?
-    pub text: Box<String>,
 }
 
 impl UnscannedTextFragmentInfo {
@@ -716,7 +713,7 @@ impl UnscannedTextFragmentInfo {
     #[inline]
     pub fn from_text(text: String) -> UnscannedTextFragmentInfo {
         UnscannedTextFragmentInfo {
-            text: box text,
+            text: text.into_boxed_slice(),
         }
     }
 }
@@ -847,7 +844,7 @@ impl Fragment {
     }
 
     /// Transforms this fragment using the given `SplitInfo`, preserving all the other data.
-    pub fn transform_with_split_info(&self, split: &SplitInfo, text_run: Arc<Box<TextRun>>)
+    pub fn transform_with_split_info(&self, split: &SplitInfo, text_run: Arc<TextRun>)
                                      -> Fragment {
         let size = LogicalSize::new(self.style.writing_mode,
                                     split.inline_size,

components/layout/inline.rs

@@ -408,7 +408,7 @@ impl LineBreaker {
                 fragment.specific {
             let scanned_text_fragment_info = &mut **scanned_text_fragment_info;
             let mut range = &mut scanned_text_fragment_info.range;
-            strip_trailing_whitespace_if_necessary(&**scanned_text_fragment_info.run, range);
+            strip_trailing_whitespace_if_necessary(&*scanned_text_fragment_info.run, range);
 
             let old_fragment_inline_size = fragment.border_box.size.inline +
                 fragment.margin.inline_start_end();

components/layout/lib.rs

@@ -4,6 +4,7 @@
 
 #![feature(append)]
 #![feature(arc_unique)]
+#![feature(box_str)]
 #![feature(box_syntax)]
 #![feature(cell_extras)]
 #![feature(custom_derive)]

components/layout/text.rs

@@ -276,7 +276,7 @@ impl TextRunScanner {
                     options.flags.insert(RTL_FLAG);
                 }
                 let mut font = fontgroup.fonts.get(run_info.font_index).unwrap().borrow_mut();
-                Arc::new(box TextRun::new(&mut *font, run_info.text, &options, run_info.bidi_level))
+                Arc::new(TextRun::new(&mut *font, run_info.text, &options, run_info.bidi_level))
             }).collect::<Vec<_>>()
         };
 
@@ -398,9 +398,9 @@ fn split_first_fragment_at_newline_if_necessary(fragments: &mut LinkedList<Fragm
             };
 
             string_before =
-                box unscanned_text_fragment_info.text[..(position + 1)].to_owned();
+                unscanned_text_fragment_info.text[..(position + 1)].to_owned().into_boxed_slice();
             unscanned_text_fragment_info.text =
-                box unscanned_text_fragment_info.text[(position + 1)..].to_owned();
+                unscanned_text_fragment_info.text[(position + 1)..].to_owned().into_boxed_slice();
         }
         first_fragment.transform(first_fragment.border_box.size,
                                  SpecificFragmentInfo::UnscannedText(UnscannedTextFragmentInfo {