mirror of
https://github.com/servo/servo.git
synced 2025-08-05 21:50:18 +01:00
Auto merge of #8800 - servo:warnings, r=metajack
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:
commit
32b90cdb6f
11 changed files with 121 additions and 122 deletions
|
@ -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 {
|
||||
|
|
|
@ -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
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue