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

Upgrade to rustc 1.4.0-dev (cb9323ec0 2015-09-01)

Browse source
This commit is contained in:
Simon Sapin 2015-09-02 07:57:55 +02:00
parent ba2cb77c26
commit 40b4348824
28 changed files with 349 additions and 338 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/layout/animation.rs
View file

@ -108,7 +108,7 @@ pub fn recalc_style_for_animations(flow: &mut Flow,
}
let mut new_style = fragment.style.clone();
animation.property_animation.update(&mut *Arc::make_unique(&mut new_style),
animation.property_animation.update(&mut *Arc::make_mut(&mut new_style),
progress);
damage.insert(incremental::compute_damage(&Some(fragment.style.clone()),
&new_style));

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

@ -448,7 +448,7 @@ impl<'ln> PrivateMatchMethods for LayoutNode<'ln> {
let this_opaque = self.opaque();
if let Some(ref animations) = layout_context.running_animations.get(&this_opaque) {
for animation in *animations {
animation.property_animation.update(&mut *Arc::make_unique(style), 1.0);
animation.property_animation.update(&mut *Arc::make_mut(style), 1.0);
}
}
}

2
components/layout/flow.rs
View file

@ -1493,7 +1493,7 @@ impl ContainingBlockLink {
}
fn set(&mut self, link: FlowRef) {
self.link = Some(link.downgrade())
self.link = Some(Arc::downgrade(&link))
}
#[allow(unsafe_code)]

6
components/layout/fragment.rs
View file

@ -724,7 +724,7 @@ impl UnscannedTextFragmentInfo {
#[inline]
pub fn from_text(text: String) -> UnscannedTextFragmentInfo {
UnscannedTextFragmentInfo {
text: text.into_boxed_slice(),
text: text.into_boxed_str(),
}
}
}
@ -2160,7 +2160,7 @@ impl Fragment {
break
}
if modified {
unscanned_text_fragment_info.text = new_text_string.into_boxed_slice();
unscanned_text_fragment_info.text = new_text_string.into_boxed_str();
}
WhitespaceStrippingResult::from_unscanned_text_fragment_info(
@ -2238,7 +2238,7 @@ impl Fragment {
for character in trailing_bidi_control_characters_to_retain.iter().rev() {
text.push(*character);
}
unscanned_text_fragment_info.text = text.into_boxed_slice();
unscanned_text_fragment_info.text = text.into_boxed_str();
}
WhitespaceStrippingResult::from_unscanned_text_fragment_info(

6
components/layout/inline.rs
View file

@ -1119,9 +1119,9 @@ impl InlineFlow {
// FIXME(pcwalton): This is an awful lot of uniqueness making. I don't see any easy way
// to get rid of it without regressing the performance of the non-justified case,
// though.
let run = Arc::make_unique(&mut scanned_text_fragment_info.run);
let run = Arc::make_mut(&mut scanned_text_fragment_info.run);
{
let glyph_runs = Arc::make_unique(&mut run.glyphs);
let glyph_runs = Arc::make_mut(&mut run.glyphs);
for mut glyph_run in &mut *glyph_runs {
let mut range = glyph_run.range.intersect(&fragment_range);
if range.is_empty() {
@ -1129,7 +1129,7 @@ impl InlineFlow {
}
range.shift_by(-glyph_run.range.begin());
let glyph_store = Arc::make_unique(&mut glyph_run.glyph_store);
let glyph_store = Arc::make_mut(&mut glyph_run.glyph_store);
glyph_store.distribute_extra_space_in_range(&range,
space_per_expansion_opportunity);
}

2
components/layout/text.rs
View file

@ -400,7 +400,7 @@ fn split_first_fragment_at_newline_if_necessary(fragments: &mut LinkedList<Fragm
string_before =
unscanned_text_fragment_info.text[..(position + 1)].to_owned();
unscanned_text_fragment_info.text =
unscanned_text_fragment_info.text[(position + 1)..].to_owned().into_boxed_slice();
unscanned_text_fragment_info.text[(position + 1)..].to_owned().into_boxed_str();
}
first_fragment.transform(first_fragment.border_box.size,
SpecificFragmentInfo::UnscannedText(