Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 41 additions & 1 deletion src/librustc_lint/builtin.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1704,7 +1704,6 @@ impl LintPass for SoftLints {
}
}


declare_lint! {
pub ELLIPSIS_INCLUSIVE_RANGE_PATTERNS,
Allow,
Expand Down Expand Up @@ -1739,3 +1738,44 @@ impl EarlyLintPass for EllipsisInclusiveRangePatterns {
}
}
}

declare_lint! {
UNNAMEABLE_TEST_FUNCTIONS,
Warn,
"detects an function that cannot be named being marked as #[test]"
}

pub struct UnnameableTestFunctions;

impl LintPass for UnnameableTestFunctions {
fn get_lints(&self) -> LintArray {
lint_array!(UNNAMEABLE_TEST_FUNCTIONS)
}
}

impl<'a, 'tcx> LateLintPass<'a, 'tcx> for UnnameableTestFunctions {
fn check_item(&mut self, cx: &LateContext, it: &hir::Item) {
match it.node {
hir::ItemFn(..) => {
for attr in &it.attrs {
if attr.name() == "test" {
let parent = cx.tcx.hir.get_parent(it.id);
match cx.tcx.hir.find(parent) {
Some(hir_map::NodeItem(hir::Item {node: hir::ItemMod(_), ..})) |
None => {}
_ => {
cx.struct_span_lint(
UNNAMEABLE_TEST_FUNCTIONS,
attr.span,
"cannot test inner function",
).emit();
}
}
break;
}
}
}
_ => return,
};
}
}
1 change: 1 addition & 0 deletions src/librustc_lint/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ pub fn register_builtins(store: &mut lint::LintStore, sess: Option<&Session>) {
MutableTransmutes: MutableTransmutes,
UnionsWithDropFields: UnionsWithDropFields,
UnreachablePub: UnreachablePub,
UnnameableTestFunctions: UnnameableTestFunctions,
TypeAliasBounds: TypeAliasBounds,
UnusedBrokenConst: UnusedBrokenConst,
TrivialConstraints: TrivialConstraints,
Expand Down
29 changes: 29 additions & 0 deletions src/test/ui/lint/test-inner-fn.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
// Copyright 2018 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 -D unnameable_test_functions

#[test]
fn foo() {
#[test] //~ ERROR cannot test inner function [unnameable_test_functions]
fn bar() {}
bar();
}

mod x {
#[test]
fn foo() {
#[test] //~ ERROR cannot test inner function [unnameable_test_functions]
fn bar() {}
bar();
}
}

fn main() {}
16 changes: 16 additions & 0 deletions src/test/ui/lint/test-inner-fn.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
error: cannot test inner function
--> $DIR/test-inner-fn.rs:15:5
|
LL | #[test] //~ ERROR cannot test inner function [unnameable_test_functions]
| ^^^^^^^
|
= note: requested on the command line with `-D unnameable-test-functions`

error: cannot test inner function
--> $DIR/test-inner-fn.rs:23:9
|
LL | #[test] //~ ERROR cannot test inner function [unnameable_test_functions]
| ^^^^^^^

error: aborting due to 2 previous errors