removing StrBuf

Author: tedhorst

datetime.rs

@@ -71,6 +71,7 @@ pub fn month_length(m: i32, ly: bool) -> i32 {
 	month_length_vec[m as uint] + xtra
 }
 
+#[deriving(Show)]
 pub struct DateSpec { year: i32, mon: i32, mday: i32, yday: i32}
 
 #[inline(always)]
@@ -294,7 +295,7 @@ mod tests {
 
 	fn time_str<T: super::Time>(t: T) -> String {
 		let tm = t.tm();
-		format_strbuf!("{}{}", tm.strftime("%H:%M:%S"), if tm.tm_nsec != 0 { format_strbuf!("{:09i}", tm.tm_nsec as int) } else { "".to_strbuf() })
+		format!("{}{}", tm.strftime("%H:%M:%S"), if tm.tm_nsec != 0 { format!("{:09i}", tm.tm_nsec as int) } else { "".to_string() })
 
 	}
 
@@ -306,7 +307,7 @@ mod tests {
 
 	fn datetime_str<T: super::DateTime>(t: T) -> String {
 		let tm = t.tm();
-		format_strbuf!("{}{}", tm.strftime("%Y-%m-%d %H:%M:%S"), if tm.tm_nsec != 0 { format_strbuf!("{:09i}", tm.tm_nsec as int) } else { "".to_strbuf() })
+		format!("{}{}", tm.strftime("%Y-%m-%d %H:%M:%S"), if tm.tm_nsec != 0 { format!("{:09i}", tm.tm_nsec as int) } else { "".to_string() })
 
 	}
 
@@ -315,12 +316,12 @@ mod tests {
 		let tm = i.tm();
 		let i2: T = ::Time::from_tm(&tm);
 		if i2 != i {
-			fail!(format!("test_time failed for: {}, {}, {:?}", i, i2, tm))
+			fail!(format!("test_time failed for: {}, {}, {}", i, i2, tm))
 		}
 		let ts = i.timespec();
 		let i2: T = ::Time::from_timespec(ts);
 		if i2 != i {
-			fail!(format!("test_time failed for: {}, {}, {:?}", i, i2, ts))
+			fail!(format!("test_time failed for: {}, {}, {}", i, i2, ts))
 		}
 	}
 
@@ -339,12 +340,12 @@ mod tests {
 		let tm = i.tm();
 		let i2: T = ::Date::from_tm(&tm);
 		if i2 != i {
-			fail!(format!("test_date failed for: {}, {}, {:?}", i, i2, tm))
+			fail!(format!("test_date failed for: {}, {}, {}", i, i2, tm))
 		}
 		let ts = i.timespec();
 		let i2: T = ::Date::from_timespec(ts);
 		if i2 != i {
-			fail!(format!("test_date failed for: {}, {}, {:?}", i, i2, ts))
+			fail!(format!("test_date failed for: {}, {}, {}", i, i2, ts))
 		}
 	}
 
@@ -371,12 +372,12 @@ mod tests {
 		match tsdr {
 			Ok(dt) => {
 				let dts = datetime_str(dt);
-				if s.to_strbuf() != dts {
+				if s.to_string() != dts {
 					fail!(format!("test_dt_str: {}, {}", s, dts))
 				}
 			}
 			Err(ref es) => {
-				fail!(format!("test_dt_str: {}, {:?}", s, es))
+				fail!(format!("test_dt_str: {}, {}", s, es))
 			}
 		}
 	}
@@ -400,15 +401,15 @@ mod tests {
 				let dtm = dts.tm();
 				let stm = ::time::at_utc(dts);
 				if stm != dtm {
-					fail!(format!("test_std_time: {}, {:?}, {:?}", s, dtm, stm))
+					fail!(format!("test_std_time: {}, {}, {}", s, dtm, stm))
 				}
 				let sts = dtm.to_timespec();
 				if dts != sts {
-					fail!(format!("test_std_time: {}, {:?}, {:?}", s, dts, sts))
+					fail!(format!("test_std_time: {}, {}, {}", s, dts, sts))
 				}
 			}
 			Err(ref es) => {
-				fail!(format!("test_std_time: {}, {:?}", s, es))
+				fail!(format!("test_std_time: {}, {}", s, es))
 			}
 		}
 		let ir = timespec_from_str(s);
@@ -418,15 +419,15 @@ mod tests {
 				let dtm = dt.tm();
 				let stm = ::time::at_utc(dts);
 				if stm != dtm {
-					fail!(format!("test_std_time i64: {}, {:?}, {:?}", s, dtm, stm))
+					fail!(format!("test_std_time i64: {}, {}, {}", s, dtm, stm))
 				}
 				let sts = dtm.to_timespec();
 				if dts != sts {
-					fail!(format!("test_std_time i64: {}, {:?}, {:?}", s, dts, sts))
+					fail!(format!("test_std_time i64: {}, {}, {}", s, dts, sts))
 				}
 			}
 			Err(ref es) => {
-				fail!(format!("test_std_time i64: {}, {:?}", s, es))
+				fail!(format!("test_std_time i64: {}, {}", s, es))
 			}
 		}
 	}
@@ -474,11 +475,11 @@ mod tests {
 		   dt.mday > ::month_length(dt.mon, ::leapyear(dt.year)) + 1 ||
 		   dt.yday < 0 ||
 		   dt.yday > 365 {
-			fail!(format!("test_funcs:, {}, {:?}", inp, dt))
+			fail!(format!("test_funcs:, {}, {}", inp, dt))
 		}
 		let d = ::days_from_date(dt.year, dt.mon, dt.mday);
 		if d != inp {
-			fail!(format!("test_funcs: {}, {:?}, {}", inp, dt, d))
+			fail!(format!("test_funcs: {}, {}, {}", inp, dt, d))
 		}
 		debug!("test_funcs {} {}", inp, date_str(inp));
 	}