---

yaml
---
r: 152268
b: refs/heads/try2
c: 2382bf4
h: refs/heads/master
v: v3

Author: tomjakubowski

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 0c74911f87c12f0680e21e49a8f9c0c85affac78
+refs/heads/try2: 2382bf42df52d35cce39507048670c76edd5a7b5
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librustdoc/clean/inline.rs

@@ -147,10 +147,18 @@ pub fn build_external_trait(tcx: &ty::ctxt, did: ast::DefId) -> clean::Trait {
             clean::Required(meth)
         }
     });
+    let supertraits = ty::trait_supertraits(tcx, did);
+    let mut parents = supertraits.iter().map(|i| {
+        match i.clean() {
+            clean::TraitBound(ty) => ty,
+            clean::RegionBound => unreachable!()
+        }
+    });
+
     clean::Trait {
         generics: def.generics.clean(),
         methods: methods.collect(),
-        parents: Vec::new(), // FIXME: this is likely wrong
+        parents: parents.collect()
     }
 }
 

branches/try2/src/libstd/io/util.rs

@@ -229,36 +229,6 @@ pub fn copy<R: Reader, W: Writer>(r: &mut R, w: &mut W) -> io::IoResult<()> {
     }
 }
 
-/// A `Reader` which converts an `Iterator<u8>` into a `Reader`.
-pub struct IterReader<T> {
-    iter: T,
-}
-
-impl<T: Iterator<u8>> IterReader<T> {
-    /// Create a new `IterReader` which will read from the specified `Iterator`.
-    pub fn new(iter: T) -> IterReader<T> {
-        IterReader {
-            iter: iter,
-        }
-    }
-}
-
-impl<T: Iterator<u8>> Reader for IterReader<T> {
-    #[inline]
-    fn read(&mut self, buf: &mut [u8]) -> io::IoResult<uint> {
-        let mut len = 0;
-        for (slot, elt) in buf.mut_iter().zip(self.iter.by_ref()) {
-            *slot = elt;
-            len += 1;
-        }
-        if len == 0 {
-            Err(io::standard_error(io::EndOfFile))
-        } else {
-            Ok(len)
-        }
-    }
-}
-
 #[cfg(test)]
 mod test {
     use io::{MemReader, MemWriter, BufReader};
@@ -396,23 +366,4 @@ mod test {
             assert_eq!(r.read_line(), Ok("23456789\n".to_str()));
         }
     }
-
-    #[test]
-    fn test_iter_reader() {
-        let mut r = IterReader::new(range(0u8, 8));
-        let mut buf = [0, 0, 0];
-        let len = r.read(buf).unwrap();
-        assert_eq!(len, 3);
-        assert!(buf == [0, 1, 2]);
-
-        let len = r.read(buf).unwrap();
-        assert_eq!(len, 3);
-        assert!(buf == [3, 4, 5]);
-
-        let len = r.read(buf).unwrap();
-        assert_eq!(len, 2);
-        assert!(buf == [6, 7, 5]);
-
-        assert_eq!(r.read(buf).unwrap_err().kind, io::EndOfFile);
-    }
 }