---

yaml
---
r: 233722
b: refs/heads/beta
c: 15d6837
h: refs/heads/master
v: v3

Author: wthrowe

[refs]

@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
 refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
 refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
 refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
-refs/heads/beta: 45de9de1e99c3d6a38055835b0fe6c65e1ddac73
+refs/heads/beta: 15d6837a16d727a3d37a703eaedf48e62c260290
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: 370fe2786109360f7c35b8ba552b83b773dd71d6
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/src/libsyntax/test.rs

@@ -14,6 +14,7 @@
 #![allow(unused_imports)]
 use self::HasTestSignature::*;
 
+use std::iter;
 use std::slice;
 use std::mem;
 use std::vec;
@@ -24,6 +25,7 @@ use codemap::{DUMMY_SP, Span, ExpnInfo, NameAndSpan, MacroAttribute};
 use codemap;
 use diagnostic;
 use config;
+use entry::{self, EntryPointType};
 use ext::base::ExtCtxt;
 use ext::build::AstBuilder;
 use ext::expand::ExpansionConfig;
@@ -177,22 +179,39 @@ impl<'a> fold::Folder for TestHarnessGenerator<'a> {
         // the one we're going to add. Only if compiling an executable.
 
         mod_folded.items = mem::replace(&mut mod_folded.items, vec![]).move_map(|item| {
-            item.map(|ast::Item {id, ident, attrs, node, vis, span}| {
-                ast::Item {
-                    id: id,
-                    ident: ident,
-                    attrs: attrs.into_iter().filter_map(|attr| {
-                        if !attr.check_name("main") {
-                            Some(attr)
-                        } else {
-                            None
+            match entry::entry_point_type(&item, self.cx.path.len() + 1) {
+                EntryPointType::MainNamed |
+                EntryPointType::MainAttr |
+                EntryPointType::Start =>
+                    item.map(|ast::Item {id, ident, attrs, node, vis, span}| {
+                        let allow_str = InternedString::new("allow");
+                        let dead_code_str = InternedString::new("dead_code");
+                        let allow_dead_code_item =
+                            attr::mk_list_item(allow_str,
+                                               vec![attr::mk_word_item(dead_code_str)]);
+                        let allow_dead_code = attr::mk_attr_outer(attr::mk_attr_id(),
+                                                                  allow_dead_code_item);
+
+                        ast::Item {
+                            id: id,
+                            ident: ident,
+                            attrs: attrs.into_iter().filter_map(|attr| {
+                                if !attr.check_name("main") {
+                                    Some(attr)
+                                } else {
+                                    None
+                                }
+                            })
+                                .chain(iter::once(allow_dead_code))
+                                .collect(),
+                            node: node,
+                            vis: vis,
+                            span: span
                         }
-                    }).collect(),
-                    node: node,
-                    vis: vis,
-                    span: span
-                }
-            })
+                    }),
+                EntryPointType::None |
+                EntryPointType::OtherMain => item,
+            }
         });
 
         if !tests.is_empty() || !tested_submods.is_empty() {

branches/beta/src/test/compile-fail/test-warns-dead-code.rs

@@ -0,0 +1,17 @@
+// Copyright 2015 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.
+
+// compile-flags: --test
+
+#![deny(dead_code)]
+
+fn dead() {} //~ error: function is never used: `dead`
+
+fn main() {}

branches/beta/src/test/run-pass/test-main-not-dead-attr.rs

@@ -0,0 +1,18 @@
+// Copyright 2015 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.
+
+// compile-flags: --test
+
+#![feature(main)]
+
+#![deny(dead_code)]
+
+#[main]
+fn foo() { panic!(); }

branches/beta/src/test/run-pass/test-main-not-dead.rs

@@ -0,0 +1,15 @@
+// Copyright 2015 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.
+
+// compile-flags: --test
+
+#![deny(dead_code)]
+
+fn main() { panic!(); }