Skip to content

Commit a86dd63

Browse files
committed
Make missing_inline_in_public_items warn on executables
1 parent b42f87c commit a86dd63

File tree

4 files changed

+27
-16
lines changed

4 files changed

+27
-16
lines changed

clippy_lints/src/missing_inline.rs

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
use clippy_utils::diagnostics::{span_lint, span_lint_hir};
2-
use clippy_utils::fulfill_or_allowed;
32
use rustc_hir::attrs::AttributeKind;
43
use rustc_hir::def_id::DefId;
54
use rustc_hir::{self as hir, Attribute, find_attr};
65
use rustc_lint::{LateContext, LateLintPass, LintContext};
76
use rustc_middle::ty::AssocContainer;
7+
use rustc_session::config::CrateType;
88
use rustc_session::declare_lint_pass;
99
use rustc_span::Span;
1010

@@ -82,15 +82,6 @@ fn check_missing_inline_attrs(
8282
}
8383
}
8484

85-
fn is_executable_or_proc_macro(cx: &LateContext<'_>) -> bool {
86-
use rustc_session::config::CrateType;
87-
88-
cx.tcx
89-
.crate_types()
90-
.iter()
91-
.any(|t: &CrateType| matches!(t, CrateType::Executable | CrateType::ProcMacro))
92-
}
93-
9485
declare_lint_pass!(MissingInline => [MISSING_INLINE_IN_PUBLIC_ITEMS]);
9586

9687
impl<'tcx> LateLintPass<'tcx> for MissingInline {
@@ -99,9 +90,11 @@ impl<'tcx> LateLintPass<'tcx> for MissingInline {
9990
return;
10091
}
10192

102-
if is_executable_or_proc_macro(cx)
103-
// Allow the lint if it is expected, when building with `--test`
104-
&& !(cx.sess().is_test_crate() && fulfill_or_allowed(cx, MISSING_INLINE_IN_PUBLIC_ITEMS, [it.hir_id()]))
93+
if cx
94+
.tcx
95+
.crate_types()
96+
.iter()
97+
.any(|t: &CrateType| matches!(t, CrateType::ProcMacro))
10598
{
10699
return;
107100
}
@@ -157,7 +150,13 @@ impl<'tcx> LateLintPass<'tcx> for MissingInline {
157150
}
158151

159152
fn check_impl_item(&mut self, cx: &LateContext<'tcx>, impl_item: &'tcx hir::ImplItem<'_>) {
160-
if impl_item.span.in_external_macro(cx.sess().source_map()) || is_executable_or_proc_macro(cx) {
153+
if impl_item.span.in_external_macro(cx.sess().source_map())
154+
|| cx
155+
.tcx
156+
.crate_types()
157+
.iter()
158+
.any(|t: &CrateType| matches!(t, CrateType::ProcMacro))
159+
{
161160
return;
162161
}
163162

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
//@ check-pass
2-
31
#![warn(clippy::missing_inline_in_public_items)]
42

53
pub fn foo() {}
4+
//~^ missing_inline_in_public_items
65

76
fn main() {}
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
error: missing `#[inline]` for a function
2+
--> tests/ui/missing_inline_executable.rs:3:1
3+
|
4+
LL | pub fn foo() {}
5+
| ^^^^^^^^^^^^^^^
6+
|
7+
= note: `-D clippy::missing-inline-in-public-items` implied by `-D warnings`
8+
= help: to override `-D warnings` add `#[allow(clippy::missing_inline_in_public_items)]`
9+
10+
error: aborting due to 1 previous error
11+

tests/ui/missing_inline_test_crate.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,5 @@
66
pub fn foo() -> u32 {
77
0
88
}
9+
10+
fn private_function() {}

0 commit comments

Comments
 (0)