Use {} instead of {:?} for debug!ing in util::range

This commit is contained in:
Brendan Zabarauskas 2014-05-07 13:20:08 -07:00
parent 8c6eb08dcb
commit ea68051937

View file

@ -8,6 +8,7 @@ use std::fmt;
use std::num; use std::num;
use std::num::Bounded; use std::num::Bounded;
#[deriving(Show)]
pub enum RangeRelation<T> { pub enum RangeRelation<T> {
OverlapsBegin(/* overlap */ T), OverlapsBegin(/* overlap */ T),
OverlapsEnd(/* overlap */ T), OverlapsEnd(/* overlap */ T),
@ -69,8 +70,8 @@ impl<T: Int + TotalOrd> Range<T> {
self.begin() < len && self.end() <= len && self.length() <= len self.begin() < len && self.end() <= len && self.length() <= len
}, },
None => { None => {
debug!("Range<T>::is_valid_for_string: string length ({}) is longer than the max \ debug!("Range<T>::is_valid_for_string: string length (len={}) is longer than the max \
value for T ({})", s_len, { let val: T = Bounded::max_value(); val }); value for T (max={})", s_len, { let val: T = Bounded::max_value(); val });
false false
}, },
} }
@ -148,16 +149,16 @@ impl<T: Int + TotalOrd> Range<T> {
let overlap = other.end() - self.begin(); let overlap = other.end() - self.begin();
return OverlapsEnd(overlap); return OverlapsEnd(overlap);
} }
fail!("relation_to_range(): didn't classify self={:?}, other={:?}", fail!("relation_to_range(): didn't classify self={}, other={}",
self, other); self, other);
} }
#[inline] #[inline]
pub fn repair_after_coalesced_range(&mut self, other: &Range<T>) { pub fn repair_after_coalesced_range(&mut self, other: &Range<T>) {
let relation = self.relation_to_range(other); let relation = self.relation_to_range(other);
debug!("repair_after_coalesced_range: possibly repairing range {:?}", self); debug!("repair_after_coalesced_range: possibly repairing range {}", *self);
debug!("repair_after_coalesced_range: relation of original range and coalesced range({:?}): {:?}", debug!("repair_after_coalesced_range: relation of original range and coalesced range {}: {}",
other, relation); *other, relation);
match relation { match relation {
EntirelyBefore => { }, EntirelyBefore => { },
EntirelyAfter => { self.shift_by(-other.length().to_int().unwrap()); }, EntirelyAfter => { self.shift_by(-other.length().to_int().unwrap()); },
@ -169,6 +170,6 @@ impl<T: Int + TotalOrd> Range<T> {
self.reset(other.begin(), len); self.reset(other.begin(), len);
} }
}; };
debug!("repair_after_coalesced_range: new range: ---- {:?}", self); debug!("repair_after_coalesced_range: new range: ---- {}", *self);
} }
} }