diff options
Diffstat (limited to 'components/layout/flow.rs')
| -rw-r--r-- | components/layout/flow.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/components/layout/flow.rs b/components/layout/flow.rs index f5e43d7b26c..7b82f1d3fd9 100644 --- a/components/layout/flow.rs +++ b/components/layout/flow.rs @@ -67,7 +67,7 @@ use std::sync::Arc; /// /// Note that virtual methods have a cost; we should not overuse them in Servo. Consider adding /// methods to `ImmutableFlowUtils` or `MutableFlowUtils` before adding more methods here. -pub trait Flow: fmt::Show + Sync { +pub trait Flow: fmt::Debug + Sync { // RTTI // // TODO(pcwalton): Use Rust's RTTI, once that works. @@ -428,7 +428,7 @@ pub trait MutableOwnedFlowUtils { fn set_absolute_descendants(&mut self, abs_descendants: AbsDescendants); } -#[derive(RustcEncodable, PartialEq, Show)] +#[derive(RustcEncodable, PartialEq, Debug)] pub enum FlowClass { Block, Inline, @@ -638,16 +638,16 @@ impl Descendants { /// Return an iterator over the descendant flows. pub fn iter<'a>(&'a mut self) -> DescendantIter<'a> { DescendantIter { - iter: self.descendant_links.slice_from_mut(0).iter_mut(), + iter: self.descendant_links.iter_mut(), } } /// Return an iterator over (descendant, static y offset). pub fn iter_with_offset<'a>(&'a mut self) -> DescendantOffsetIter<'a> { let descendant_iter = DescendantIter { - iter: self.descendant_links.slice_from_mut(0).iter_mut(), + iter: self.descendant_links.iter_mut(), }; - descendant_iter.zip(self.static_block_offsets.slice_from_mut(0).iter_mut()) + descendant_iter.zip(self.static_block_offsets.iter_mut()) } } @@ -784,7 +784,7 @@ pub struct BaseFlow { unsafe impl Send for BaseFlow {} unsafe impl Sync for BaseFlow {} -impl fmt::Show for BaseFlow { +impl fmt::Debug for BaseFlow { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { write!(f, "@ {:?}, CC {}, ADC {}", |