Skip to content

Commit

Permalink
Rollup merge of #32423 - mitaa:rdoc-vstruct-fields, r=alexcrichton
Browse files Browse the repository at this point in the history
rustdoc: Omit `pub` for inlined variant-struct fields

fixes #32395

r? @alexcrichton
  • Loading branch information
eddyb committed Mar 23, 2016
2 parents 6b4b65a + 00a32b2 commit 46b2a99
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/librustdoc/clean/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1885,7 +1885,7 @@ impl<'tcx> Clean<Item> for ty::VariantDefData<'tcx, 'static> {
source: Span::empty(),
name: Some(field.name.clean(cx)),
attrs: Vec::new(),
visibility: Some(hir::Public),
visibility: Some(field.vis),
// FIXME: this is not accurate, we need an id for
// the specific field but we're using the id
// for the whole variant. Thus we read the
Expand Down
15 changes: 15 additions & 0 deletions src/test/auxiliary/variant-struct.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
// 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.

pub enum Foo {
Bar {
qux: (),
}
}
21 changes: 21 additions & 0 deletions src/test/rustdoc/issue-32395.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
// 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.

// aux-build:variant-struct.rs
// build-aux-docs
// ignore-cross-compile

// @has variant_struct/enum.Foo.html
// @!has - 'pub qux'
extern crate variant_struct;

// @has issue_32395/enum.Foo.html
// @!has - 'pub qux'
pub use variant_struct::Foo;

0 comments on commit 46b2a99

Please sign in to comment.