Skip to content

Commit

Permalink
rustdoc: Fix generating redirect pages for statics and consts
Browse files Browse the repository at this point in the history
These were missing from the cache for some reason meaning the redirect pages failed to render.
  • Loading branch information
ollie27 committed Jun 3, 2016
1 parent 433d70c commit 4ddb541
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 1 deletion.
4 changes: 3 additions & 1 deletion src/librustdoc/html/render.rs
Expand Up @@ -1120,7 +1120,9 @@ impl DocFolder for Cache {
clean::StructItem(..) | clean::EnumItem(..) |
clean::TypedefItem(..) | clean::TraitItem(..) |
clean::FunctionItem(..) | clean::ModuleItem(..) |
clean::ForeignFunctionItem(..) if !self.stripped_mod => {
clean::ForeignFunctionItem(..) | clean::ForeignStaticItem(..) |
clean::ConstantItem(..) | clean::StaticItem(..)
if !self.stripped_mod => {
// Reexported items mean that the same id can show up twice
// in the rustdoc ast that we're looking at. We know,
// however, that a reexported item doesn't show up in the
Expand Down
23 changes: 23 additions & 0 deletions src/test/rustdoc/redirect-const.rs
@@ -0,0 +1,23 @@
// Copyright 2016 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.

#![crate_name="foo"]

pub use hidden::STATIC_FOO;
pub use hidden::CONST_FOO;

mod hidden {
// @has foo/hidden/static.STATIC_FOO.html
// @has - '//p/a' '../../foo/static.STATIC_FOO.html'
pub static STATIC_FOO: u64 = 0;
// @has foo/hidden/constant.CONST_FOO.html
// @has - '//p/a' '../../foo/constant.CONST_FOO.html'
pub const CONST_FOO: u64 = 0;
}

0 comments on commit 4ddb541

Please sign in to comment.