bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

auto merge of #9833 : alexcrichton/rust/fixes, r=brson

Browse source 
Commits have all the fun details
This commit is contained in:
bors 2013-10-16 18:11:22 -07:00
commit c92f2168d4
27 changed files with 379 additions and 125 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -219,7 +219,7 @@ pub fn run(mut crate: clean::Crate, dst: Path) {
};
mkdir(&cx.dst);
match crate.module.get_ref().doc_list() {
match crate.module.as_ref().map(|m| m.doc_list().unwrap_or(&[])) {
Some(attrs) => {
for attr in attrs.iter() {
match *attr {
@ -581,7 +581,7 @@ impl DocFolder for Cache {
clean::StructItem(*) | clean::EnumItem(*) |
clean::TypedefItem(*) | clean::TraitItem(*) |
clean::FunctionItem(*) | clean::ModuleItem(*) |
clean::VariantItem(*) => {
clean::ForeignFunctionItem(*) | clean::VariantItem(*) => {
self.paths.insert(item.id, (self.stack.clone(), shortty(&item)));
}
_ => {}