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

Auto merge of #8800 - servo:warnings, r=metajack

Browse source 
Fix warnings

Fixing unused attributes warnings required updating serde_macros
which required updating to rustc 1.6.0-nightly (a2866e387 2015-11-30)
which required updating some other dependencies.

Fix #8709.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8800)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-12-04 05:37:38 +05:30
commit 32b90cdb6f
11 changed files with 121 additions and 122 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/layout/display_list_builder.rs
View file

@ -1795,7 +1795,7 @@ impl InlineFlowDisplayListBuilding for InlineFlow {
// We iterate using an index here, because we want to avoid doing a doing
// a double-borrow of self (one mutable for the method call and one immutable
// for the self.fragments.fragment iterator itself).
for index in (0..self.fragments.fragments.len()) {
for index in 0..self.fragments.fragments.len() {
let establishes_stacking_context = {
let fragment = self.fragments.fragments.get(index).unwrap();
match fragment.specific {

2
components/layout/wrapper.rs
View file

@ -947,7 +947,7 @@ pub trait ThreadSafeLayoutNode<'ln> : Clone + Copy + Sized {
/// `empty_cells` per CSS 2.1 § 17.6.1.1.
fn is_content(&self) -> bool {
match self.type_id() {
Some(NodeTypeId::Element(..)) | Some(NodeTypeId::CharacterData(CharacterDataTypeId::Text(..))) => true,
Some(NodeTypeId::Element(..)) | Some(NodeTypeId::CharacterData(CharacterDataTypeId::Text)) => true,
_ => false
}
}