rustdoc: Render methods/impls for bare traits
This renders a "Methods" and "Trait Implementations" section for each item implemented for a bare trait itself. Closes #19055
This commit is contained in:
parent
ba402312fe
commit
8f6855c8c8
2 changed files with 65 additions and 32 deletions
|
@ -920,9 +920,10 @@ impl DocFolder for Cache {
|
|||
let path = match self.paths.get(&did) {
|
||||
Some(&(_, ItemType::Trait)) =>
|
||||
Some(&self.stack[..self.stack.len() - 1]),
|
||||
// The current stack not necessarily has correlation for
|
||||
// where the type was defined. On the other hand,
|
||||
// `paths` always has the right information if present.
|
||||
// The current stack not necessarily has correlation
|
||||
// for where the type was defined. On the other
|
||||
// hand, `paths` always has the right
|
||||
// information if present.
|
||||
Some(&(ref fqp, ItemType::Struct)) |
|
||||
Some(&(ref fqp, ItemType::Enum)) =>
|
||||
Some(&fqp[..fqp.len() - 1]),
|
||||
|
@ -1861,6 +1862,9 @@ fn item_trait(w: &mut fmt::Formatter, cx: &Context, it: &clean::Item,
|
|||
try!(write!(w, "</div>"));
|
||||
}
|
||||
|
||||
// If there are methods directly on this trait object, render them here.
|
||||
try!(render_methods(w, it));
|
||||
|
||||
let cache = cache();
|
||||
try!(write!(w, "
|
||||
<h2 id='implementors'>Implementors</h2>
|
||||
|
@ -2179,9 +2183,11 @@ enum MethodLink {
|
|||
}
|
||||
|
||||
fn render_methods(w: &mut fmt::Formatter, it: &clean::Item) -> fmt::Result {
|
||||
match cache().impls.get(&it.def_id) {
|
||||
Some(v) => {
|
||||
let (non_trait, traits): (Vec<_>, _) = v.iter().cloned()
|
||||
let v = match cache().impls.get(&it.def_id) {
|
||||
Some(v) => v.clone(),
|
||||
None => return Ok(()),
|
||||
};
|
||||
let (non_trait, traits): (Vec<_>, _) = v.into_iter()
|
||||
.partition(|i| i.impl_.trait_.is_none());
|
||||
if non_trait.len() > 0 {
|
||||
try!(write!(w, "<h2 id='methods'>Methods</h2>"));
|
||||
|
@ -2208,9 +2214,6 @@ fn render_methods(w: &mut fmt::Formatter, it: &clean::Item) -> fmt::Result {
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
None => {}
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
|
|
30
src/test/rustdoc/issue-19055.rs
Normal file
30
src/test/rustdoc/issue-19055.rs
Normal file
|
@ -0,0 +1,30 @@
|
|||
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
|
||||
// file at the top-level directory of this distribution and at
|
||||
// http://rust-lang.org/COPYRIGHT.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
||||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
||||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
||||
// option. This file may not be copied, modified, or distributed
|
||||
// except according to those terms.
|
||||
|
||||
// @has issue_19055/trait.Any.html
|
||||
pub trait Any {}
|
||||
|
||||
impl<'any> Any + 'any {
|
||||
// @has - '//*[@id="method.is"]' 'fn is'
|
||||
pub fn is<T: 'static>(&self) -> bool { loop {} }
|
||||
|
||||
// @has - '//*[@id="method.downcast_ref"]' 'fn downcast_ref'
|
||||
pub fn downcast_ref<T: 'static>(&self) -> Option<&T> { loop {} }
|
||||
|
||||
// @has - '//*[@id="method.downcast_mut"]' 'fn downcast_mut'
|
||||
pub fn downcast_mut<T: 'static>(&mut self) -> Option<&mut T> { loop {} }
|
||||
}
|
||||
|
||||
pub trait Foo {
|
||||
fn foo(&self) {}
|
||||
}
|
||||
|
||||
// @has - '//*[@id="method.foo"]' 'fn foo'
|
||||
impl Foo for Any {}
|
Loading…
Add table
Add a link
Reference in a new issue