diff options
| author | bors <bors@rust-lang.org> | 2013-11-02 12:11:18 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-11-02 12:11:18 -0700 |
| commit | e0c01ca15383513eb2981b6ee532c33ea546b4a8 (patch) | |
| tree | 37e056a0156eaa625287789e5d85eca9a07dbef6 | |
| parent | 3899f8da6b3da631a110041384a088403468d225 (diff) | |
| parent | ba436a808243a4a6b9e1c052b2fad9f1a7102ff6 (diff) | |
auto merge of #10165 : dcrewi/rust/missing-doc-on-private-trait, r=cmr
Fixes #10069.
| -rw-r--r-- | src/librustc/middle/lint.rs | 7 | ||||
| -rw-r--r-- | src/test/compile-fail/lint-missing-doc.rs | 5 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/librustc/middle/lint.rs b/src/librustc/middle/lint.rs index e8f9dad6585..4517e19f48e 100644 --- a/src/librustc/middle/lint.rs +++ b/src/librustc/middle/lint.rs @@ -951,10 +951,9 @@ impl Visitor<()> for MissingDocLintVisitor { // trait (which was already linted) ast::item_impl(_, Some(*), _, _) => return, - ast::item_trait(*) if it.vis == ast::public => { - self.check_attrs(it.attrs, it.id, it.span, - ~"missing documentation for a trait"); - } + ast::item_trait(*) if it.vis != ast::public => return, + ast::item_trait(*) => self.check_attrs(it.attrs, it.id, it.span, + ~"missing documentation for a trait"), ast::item_fn(*) if it.vis == ast::public => { self.check_attrs(it.attrs, it.id, it.span, diff --git a/src/test/compile-fail/lint-missing-doc.rs b/src/test/compile-fail/lint-missing-doc.rs index 22710ad90e8..463fd352c5a 100644 --- a/src/test/compile-fail/lint-missing-doc.rs +++ b/src/test/compile-fail/lint-missing-doc.rs @@ -45,10 +45,9 @@ pub trait C {} //~ ERROR: missing documentation #[allow(missing_doc)] pub trait D {} trait Bar { - /// dox fn foo(); - fn foo2(); //~ ERROR: missing documentation - fn foo3(); //~ ERROR: missing documentation + fn foo_with_impl() { + } } impl Foo { |