Skip to content

Commit 4ddb541

Browse files
committed
rustdoc: Fix generating redirect pages for statics and consts
These were missing from the cache for some reason meaning the redirect pages failed to render.
1 parent 433d70c commit 4ddb541

File tree

2 files changed

+26
-1
lines changed

2 files changed

+26
-1
lines changed

src/librustdoc/html/render.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -1120,7 +1120,9 @@ impl DocFolder for Cache {
11201120
clean::StructItem(..) | clean::EnumItem(..) |
11211121
clean::TypedefItem(..) | clean::TraitItem(..) |
11221122
clean::FunctionItem(..) | clean::ModuleItem(..) |
1123-
clean::ForeignFunctionItem(..) if !self.stripped_mod => {
1123+
clean::ForeignFunctionItem(..) | clean::ForeignStaticItem(..) |
1124+
clean::ConstantItem(..) | clean::StaticItem(..)
1125+
if !self.stripped_mod => {
11241126
// Reexported items mean that the same id can show up twice
11251127
// in the rustdoc ast that we're looking at. We know,
11261128
// however, that a reexported item doesn't show up in the

src/test/rustdoc/redirect-const.rs

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
#![crate_name="foo"]
12+
13+
pub use hidden::STATIC_FOO;
14+
pub use hidden::CONST_FOO;
15+
16+
mod hidden {
17+
// @has foo/hidden/static.STATIC_FOO.html
18+
// @has - '//p/a' '../../foo/static.STATIC_FOO.html'
19+
pub static STATIC_FOO: u64 = 0;
20+
// @has foo/hidden/constant.CONST_FOO.html
21+
// @has - '//p/a' '../../foo/constant.CONST_FOO.html'
22+
pub const CONST_FOO: u64 = 0;
23+
}

0 commit comments

Comments
 (0)