mathieu/granite-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

rustdoc: Fix broken struct field search links

Browse source 
Takes the same approach as variants, writes a redirect index page back to the
struct with an anchor to the field in question.

Closes #9524
This commit is contained in:
Alex Crichton 2013-09-26 11:09:47 -07:00
parent 6f991a2441
commit c429c7c04b
1 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/librustdoc/html/render.rs
View file

@ -521,6 +521,14 @@ impl Context {
} }
} }
} }
clean::StructItem(s) => {
let mut it = s.fields.move_iter();
do self.recurse(name) |this| {
for item in it {
f(this, item);
}
}
}
_ => {} _ => {}
} }
} }
@ -590,6 +598,8 @@ impl<'self> fmt::Default for Item<'self> {
clean::EnumItem(ref e) => item_enum(fmt.buf, it.item, e), clean::EnumItem(ref e) => item_enum(fmt.buf, it.item, e),
clean::TypedefItem(ref t) => item_typedef(fmt.buf, it.item, t), clean::TypedefItem(ref t) => item_typedef(fmt.buf, it.item, t),
clean::VariantItem(*) => item_variant(fmt.buf, it.cx, it.item), clean::VariantItem(*) => item_variant(fmt.buf, it.cx, it.item),
clean::StructFieldItem(*) => item_struct_field(fmt.buf, it.cx,
it.item),
_ => {} _ => {}
} }
} }
@ -980,11 +990,12 @@ fn render_struct(w: &mut io::Writer, it: &clean::Item,
for field in fields.iter() { for field in fields.iter() {
match field.inner { match field.inner {
clean::StructFieldItem(ref ty) => { clean::StructFieldItem(ref ty) => {
write!(w, " {}{}: {},\n{}", write!(w, " {}<a name='field.{name}'>{name}</a>: \
{},\n{}",
VisSpace(field.visibility), VisSpace(field.visibility),
field.name.get_ref().as_slice(),
ty.type_, ty.type_,
tab); tab,
name = field.name.get_ref().as_slice());
} }
_ => unreachable!() _ => unreachable!()
} }
@ -1170,3 +1181,12 @@ fn item_variant(w: &mut io::Writer, cx: &Context, it: &clean::Item) {
*cx.current.last(), *cx.current.last(),
it.name.get_ref().as_slice()); it.name.get_ref().as_slice());
} }
fn item_struct_field(w: &mut io::Writer, cx: &Context, it: &clean::Item) {
write!(w, "<DOCTYPE html><html><head>\
<meta http-equiv='refresh' content='0; \
url=../struct.{}.html\\#field.{}'>\
</head><body></body></html>",
*cx.current.last(),
it.name.get_ref().as_slice());
}