aboutsummaryrefslogtreecommitdiffstats
path: root/components/layout/flow.rs
diff options
context:
space:
mode:
authorSimon Sapin <simon.sapin@exyr.org>2015-01-31 14:36:05 +0100
committerMatt Brubeck <mbrubeck@limpet.net>2015-02-11 14:48:34 -0800
commitd5dd1d658e5d79701fb9d028479a0fcb26a033fa (patch)
tree0c243afe9d7d82695d16bd43d72e88600e4414ef /components/layout/flow.rs
parentbc6882bdefc318402a46ede1494eb79339705c21 (diff)
downloadservo-d5dd1d658e5d79701fb9d028479a0fcb26a033fa.tar.gz
servo-d5dd1d658e5d79701fb9d028479a0fcb26a033fa.zip
Upgrade to rustc ba2f13ef0 2015-02-04
Diffstat (limited to 'components/layout/flow.rs')
-rw-r--r--components/layout/flow.rs6
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 {}",