More test fixes and rebase conflicts!

[rust.git] / src / librustc / middle / traits / util.rs

diff --git a/src/librustc/middle/traits/util.rs b/src/librustc/middle/traits/util.rs
index b9e694ff4e2b2780ee11a64d7f5df732139ddf72..cd7260b1812a33f9e5a4965e2ef18e20ebcdef0c 100644 (file)
--- a/src/librustc/middle/traits/util.rs
+++ b/src/librustc/middle/traits/util.rs
@@ -42,18 +42,19 @@ pub fn supertraits<'cx, 'tcx>(tcx: &'cx ty::ctxt<'tcx>,
                               trait_ref: Rc<ty::TraitRef<'tcx>>)
                               -> Supertraits<'cx, 'tcx>
 {
-    /// Returns an iterator over the trait reference `T` and all of its supertrait references. May
-    /// contain duplicates. In general the ordering is not defined.
-    ///
-    /// Example:
-    ///
-    /// ```
-    /// trait Foo { ... }
-    /// trait Bar : Foo { ... }
-    /// trait Baz : Bar+Foo { ... }
-    /// ```
-    ///
-    /// `supertraits(Baz)` yields `[Baz, Bar, Foo, Foo]` in some order.
+    //! Returns an iterator over the trait reference `T` and all of its supertrait references. May
+    //! contain duplicates. In general the ordering is not defined.
+    //!
+    //! Example:
+    //!
+    //! ```
+    //! trait Foo { ... }
+    //! trait Bar : Foo { ... }
+    //! trait Baz : Bar+Foo { ... }
+    //! ```
+    //!
+    //! `supertraits(Baz)` yields `[Baz, Bar, Foo, Foo]` in some order.
+
     transitive_bounds(tcx, &[trait_ref])
 }