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.

1 files changed, 3 insertions, 3 deletions

diff --git a/components/util/range.rs b/components/util/range.rs
index 8c217beb218..dba80b458f2 100644
--- a/components/util/range.rs
+++ b/components/util/range.rs
@@ -9,7 +9,7 @@ use std::num;
 use std::num::Int;
 
 /// An index type to be used by a `Range`
-pub trait RangeIndex: Int + fmt::Show {
+pub trait RangeIndex: Int + fmt::Debug {
     type Index;
     fn new(x: Self::Index) -> Self;
     fn get(self) -> Self::Index;
@@ -28,7 +28,7 @@ impl RangeIndex for int {
 #[macro_export]
 macro_rules! int_range_index {
     ($(#[$attr:meta])* struct $Self:ident($T:ty)) => (
-        #[derive(Clone, PartialEq, PartialOrd, Eq, Ord, Show, Copy)]
+        #[derive(Clone, PartialEq, PartialOrd, Eq, Ord, Debug, Copy)]
         $(#[$attr])*
         pub struct $Self(pub $T);
 
@@ -194,7 +194,7 @@ pub struct Range<I> {
     length: I,
 }
 
-impl<I: RangeIndex> fmt::Show for Range<I> {
+impl<I: RangeIndex> fmt::Debug for Range<I> {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         write!(f, "[{:?} .. {:?})", self.begin(), self.end())
     }