diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-02-11 17:24:45 -0700 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-02-11 17:24:45 -0700 |
| commit | 2cc08f289ab909de44fa09a07b2c43b70ce379b9 (patch) | |
| tree | 0c243afe9d7d82695d16bd43d72e88600e4414ef /components/layout/flow.rs | |
| parent | bc6882bdefc318402a46ede1494eb79339705c21 (diff) | |
| parent | d5dd1d658e5d79701fb9d028479a0fcb26a033fa (diff) | |
| download | servo-2cc08f289ab909de44fa09a07b2c43b70ce379b9.tar.gz servo-2cc08f289ab909de44fa09a07b2c43b70ce379b9.zip | |
auto merge of #4893 : servo/servo/rustup_2015-01-31, r=Ms2ger,glennw
Ready for review.
Final link step on android fails, but we know how to fix it and will add it to this branch soon.
Diffstat (limited to 'components/layout/flow.rs')
| -rw-r--r-- | components/layout/flow.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/components/layout/flow.rs b/components/layout/flow.rs index f5e43d7b26c..3febac7b9b3 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, @@ -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 {}", |