---

yaml
---
r: 141262
b: refs/heads/try2
c: 3d61931
h: refs/heads/master
v: v3

Author: Xazax-hun

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: c6581325ac38ce3f96cb7a0ea0aad35feed173c1
+refs/heads/try2: 3d61931fcac13aadc88ece7e48567f7ff503fba5
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librustc/middle/lint.rs

@@ -972,16 +972,23 @@ fn lint_unnecessary_allocations(cx: @mut Context) -> visit::vt<()> {
 fn lint_missing_struct_doc(cx: @mut Context) -> visit::vt<()> {
     visit::mk_simple_visitor(@visit::SimpleVisitor {
         visit_struct_field: |field| {
-            let mut has_doc = false;
-            for field.node.attrs.each |attr| {
-                if attr.node.is_sugared_doc {
-                    has_doc = true;
-                    break;
+            let relevant = match field.node.kind {
+                ast::named_field(_, vis) => vis != ast::private,
+                ast::unnamed_field => false,
+            };
+
+            if relevant {
+                let mut has_doc = false;
+                for field.node.attrs.each |attr| {
+                    if attr.node.is_sugared_doc {
+                        has_doc = true;
+                        break;
+                    }
+                }
+                if !has_doc {
+                    cx.span_lint(missing_struct_doc, field.span, "missing documentation \
+                                                                  for a field.");
                 }
-            }
-            if !has_doc {
-                cx.span_lint(missing_struct_doc, field.span, "missing documentation \
-                                                              for a field.");
             }
         },
         .. *visit::default_simple_visitor()
@@ -1003,18 +1010,22 @@ fn lint_missing_trait_doc(cx: @mut Context) -> visit::vt<()> {
                     m.span
                 },
                 ast::provided(m) => {
-                    for m.attrs.each |attr| {
-                        if attr.node.is_sugared_doc {
-                            has_doc = true;
-                            break;
+                    if m.vis == ast::private {
+                        has_doc = true;
+                    } else {
+                        for m.attrs.each |attr| {
+                            if attr.node.is_sugared_doc {
+                                has_doc = true;
+                                break;
+                            }
                         }
                     }
                     m.span
                 }
             };
             if !has_doc {
                 cx.span_lint(missing_trait_doc, span, "missing documentation \
-                                                        for a method.");
+                                                       for a method.");
             }
         },
         .. *visit::default_simple_visitor()