---

yaml
---
r: 62750
b: refs/heads/snap-stage3
c: 32c6199
h: refs/heads/master
v: v3

Author: lkuper

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 5d04ee805b96d34e7c5b316270a730fd9a0c537f
+refs/heads/snap-stage3: 32c619916179ff373a145b3006c5c19362af9b15
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/librustc/middle/lint.rs

@@ -82,9 +82,6 @@ pub enum lint {
     dead_assignment,
     unused_mut,
     unnecessary_allocation,
-
-    missing_struct_doc,
-    missing_trait_doc,
 }
 
 pub fn level_to_str(lv: level) -> &'static str {
@@ -255,20 +252,6 @@ static lint_table: &'static [(&'static str, LintSpec)] = &[
         desc: "detects unnecessary allocations that can be eliminated",
         default: warn
     }),
-
-    ("missing_struct_doc",
-     LintSpec {
-        lint: missing_struct_doc,
-        desc: "detects missing documentation for structs",
-        default: allow
-    }),
-
-    ("missing_trait_doc",
-     LintSpec {
-        lint: missing_trait_doc,
-        desc: "detects missing documentation for traits",
-        default: allow
-    }),
 ];
 
 /*
@@ -948,69 +931,6 @@ 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 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.");
-                }
-            }
-        },
-        .. *visit::default_simple_visitor()
-    })
-}
-
-fn lint_missing_trait_doc(cx: @mut Context) -> visit::vt<()> {
-    visit::mk_simple_visitor(@visit::SimpleVisitor {
-        visit_trait_method: |method| {
-            let mut has_doc = false;
-            let span = match copy *method {
-                ast::required(m) => {
-                    for m.attrs.each |attr| {
-                        if attr.node.is_sugared_doc {
-                            has_doc = true;
-                            break;
-                        }
-                    }
-                    m.span
-                },
-                ast::provided(m) => {
-                    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.");
-            }
-        },
-        .. *visit::default_simple_visitor()
-    })
-}
-
 pub fn check_crate(tcx: ty::ctxt, crate: @ast::crate) {
     let cx = @mut Context {
         dict: @get_lint_dict(),
@@ -1039,8 +959,6 @@ pub fn check_crate(tcx: ty::ctxt, crate: @ast::crate) {
     cx.add_lint(lint_unused_mut(cx));
     cx.add_lint(lint_session(cx));
     cx.add_lint(lint_unnecessary_allocations(cx));
-    cx.add_lint(lint_missing_struct_doc(cx));
-    cx.add_lint(lint_missing_trait_doc(cx));
 
     // type inference doesn't like this being declared below, we need to tell it
     // what the type of this first function is...