---

yaml
---
r: 83149
b: refs/heads/auto
c: 6969e5f
h: refs/heads/master
i:
  83147: 45dc75d
v: v3

Author: alexcrichton

[refs]

@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: abecd61a230d7057aeb1dc6d82e3c8101c7d9337
+refs/heads/auto: 6969e5fb587dff4798386b1386661920b71e9f00
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/mk/target.mk

@@ -15,9 +15,9 @@ export CFG_COMPILER_TRIPLE
 
 # The standard libraries should be held up to a higher standard than any old
 # code, make sure that these common warnings are denied by default. These can
-# be overridden during development temporarily. For stage0, we allow all these
-# to suppress warnings which may be bugs in stage0 (should be fixed in stage1+)
-WFLAGS_ST0 = -A warnings
+# be overridden during development temporarily. For stage0, we allow warnings
+# which may be bugs in stage0 (should be fixed in stage1+)
+WFLAGS_ST0 = -W warnings
 WFLAGS_ST1 = -D warnings
 WFLAGS_ST2 = -D warnings
 

branches/auto/src/libstd/result.rs

@@ -22,7 +22,6 @@ use vec;
 use vec::OwnedVector;
 use to_str::ToStr;
 use str::StrSlice;
-use fmt;
 
 /// `Result` is a type that represents either success (`Ok`) or failure (`Err`).
 ///
@@ -291,7 +290,7 @@ pub trait AsResult<T, E> {
 
 impl<T: Clone, E> option::ToOption<T> for Result<T, E> {
     #[inline]
-    fn to_option(&self) -> Option<T> {
+    fn to_option(&self)-> Option<T> {
         match *self {
             Ok(ref t) => Some(t.clone()),
             Err(_) => None,
@@ -301,7 +300,7 @@ impl<T: Clone, E> option::ToOption<T> for Result<T, E> {
 
 impl<T, E> option::IntoOption<T> for Result<T, E> {
     #[inline]
-    fn into_option(self) -> Option<T> {
+    fn into_option(self)-> Option<T> {
         match self {
             Ok(t) => Some(t),
             Err(_) => None,
@@ -311,7 +310,7 @@ impl<T, E> option::IntoOption<T> for Result<T, E> {
 
 impl<T, E> option::AsOption<T> for Result<T, E> {
     #[inline]
-    fn as_option<'a>(&'a self) -> Option<&'a T> {
+    fn as_option<'a>(&'a self)-> Option<&'a T> {
         match *self {
             Ok(ref t) => Some(t),
             Err(_) => None,
@@ -341,7 +340,7 @@ impl<T, E> AsResult<T, E> for Result<T, E> {
 
 impl<T: Clone, E: Clone> either::ToEither<E, T> for Result<T, E> {
     #[inline]
-    fn to_either(&self) -> either::Either<E, T> {
+    fn to_either(&self)-> either::Either<E, T> {
         match *self {
             Ok(ref t) => either::Right(t.clone()),
             Err(ref e) => either::Left(e.clone()),
@@ -351,7 +350,7 @@ impl<T: Clone, E: Clone> either::ToEither<E, T> for Result<T, E> {
 
 impl<T, E> either::IntoEither<E, T> for Result<T, E> {
     #[inline]
-    fn into_either(self) -> either::Either<E, T> {
+    fn into_either(self)-> either::Either<E, T> {
         match self {
             Ok(t) => either::Right(t),
             Err(e) => either::Left(e),
@@ -361,34 +360,14 @@ impl<T, E> either::IntoEither<E, T> for Result<T, E> {
 
 impl<T, E> either::AsEither<E, T> for Result<T, E> {
     #[inline]
-    fn as_either<'a>(&'a self) -> either::Either<&'a E, &'a T> {
+    fn as_either<'a>(&'a self)-> either::Either<&'a E, &'a T> {
         match *self {
             Ok(ref t) => either::Right(t),
             Err(ref e) => either::Left(e),
         }
     }
 }
 
-impl<T: ToStr, E: ToStr> ToStr for Result<T, E> {
-    #[inline]
-    fn to_str(&self) -> ~str {
-        match *self {
-            Ok(ref t) => format!("Ok({:s})", t.to_str()),
-            Err(ref e) => format!("Err({:s})", e.to_str())
-        }
-    }
-}
-
-impl<T: fmt::Default, E: fmt::Default> fmt::Default for Result<T, E> {
-    #[inline]
-    fn fmt(s: &Result<T, E>, f: &mut fmt::Formatter) {
-        match *s {
-            Ok(ref t) => write!(f.buf, "Ok({})", *t),
-            Err(ref e) => write!(f.buf, "Err({})", *e)
-        }
-    }
-}
-
 /// Takes each element in the iterator: if it is an error, no further
 /// elements are taken, and the error is returned.
 /// Should no error occur, a vector containing the values of each Result
@@ -462,8 +441,6 @@ mod tests {
     use option;
     use str::OwnedStr;
     use vec::ImmutableVector;
-    use to_str::ToStr;
-    use fmt::Default;
 
     pub fn op1() -> Result<int, ~str> { Ok(666) }
     pub fn op2() -> Result<int, ~str> { Err(~"sadface") }
@@ -682,22 +659,4 @@ mod tests {
         assert_eq!(ok.as_either().unwrap_right(), &100);
         assert_eq!(err.as_either().unwrap_left(), &404);
     }
-
-    #[test]
-    pub fn test_to_str() {
-        let ok: Result<int, ~str> = Ok(100);
-        let err: Result<int, ~str> = Err(~"Err");
-
-        assert_eq!(ok.to_str(), ~"Ok(100)");
-        assert_eq!(err.to_str(), ~"Err(Err)");
-    }
-
-    #[test]
-    pub fn test_fmt_default() {
-        let ok: Result<int, ~str> = Ok(100);
-        let err: Result<int, ~str> = Err(~"Err");
-
-        assert_eq!(format!("{}", ok), ~"Ok(100)");
-        assert_eq!(format!("{}", err), ~"Err(Err)");
-    }
 }