2021-03-25 18:29:11 +00:00
|
|
|
use clippy_utils::diagnostics::span_lint_and_then;
|
2020-03-20 22:49:15 +00:00
|
|
|
use rustc_errors::Applicability;
|
2020-03-15 17:38:20 +00:00
|
|
|
use rustc_hir::{Item, ItemKind, VisibilityKind};
|
|
|
|
use rustc_lint::{LateContext, LateLintPass};
|
|
|
|
use rustc_session::{declare_tool_lint, impl_lint_pass};
|
|
|
|
|
|
|
|
declare_clippy_lint! {
|
2021-07-29 10:16:06 +00:00
|
|
|
/// ### What it does
|
|
|
|
/// Checks for items declared `pub(crate)` that are not crate visible because they
|
2020-03-15 17:38:20 +00:00
|
|
|
/// are inside a private module.
|
|
|
|
///
|
2021-07-29 10:16:06 +00:00
|
|
|
/// ### Why is this bad?
|
|
|
|
/// Writing `pub(crate)` is misleading when it's redundant due to the parent
|
2020-03-15 17:38:20 +00:00
|
|
|
/// module's visibility.
|
|
|
|
///
|
2021-07-29 10:16:06 +00:00
|
|
|
/// ### Example
|
2020-03-15 17:38:20 +00:00
|
|
|
/// ```rust
|
|
|
|
/// mod internal {
|
|
|
|
/// pub(crate) fn internal_fn() { }
|
|
|
|
/// }
|
|
|
|
/// ```
|
|
|
|
/// This function is not visible outside the module and it can be declared with `pub` or
|
|
|
|
/// private visibility
|
|
|
|
/// ```rust
|
|
|
|
/// mod internal {
|
|
|
|
/// pub fn internal_fn() { }
|
|
|
|
/// }
|
|
|
|
/// ```
|
Added `clippy::version` attribute to all normal lints
So, some context for this, well, more a story. I'm not used to scripting, I've never really scripted anything, even if it's a valuable skill. I just never really needed it. Now, `@flip1995` correctly suggested using a script for this in `rust-clippy#7813`...
And I decided to write a script using nushell because why not? This was a mistake... I spend way more time on this than I would like to admit. It has definitely been more than 4 hours. It shouldn't take that long, but me being new to scripting and nushell just wasn't a good mixture... Anyway, here is the script that creates another script which adds the versions. Fun...
Just execute this on the `gh-pages` branch and the resulting `replacer.sh` in `clippy_lints` and it should all work.
```nu
mv v0.0.212 rust-1.00.0;
mv beta rust-1.57.0;
mv master rust-1.58.0;
let paths = (open ./rust-1.58.0/lints.json | select id id_span | flatten | select id path);
let versions = (
ls | where name =~ "rust-" | select name | format {name}/lints.json |
each { open $it | select id | insert version $it | str substring "5,11" version} |
group-by id | rotate counter-clockwise id version |
update version {get version | first 1} | flatten | select id version);
$paths | each { |row|
let version = ($versions | where id == ($row.id) | format {version})
let idu = ($row.id | str upcase)
$"sed -i '0,/($idu),/{s/pub ($idu),/#[clippy::version = "($version)"]\n pub ($idu),/}' ($row.path)"
} | str collect ";" | str find-replace --all '1.00.0' 'pre 1.29.0' | save "replacer.sh";
```
And this still has some problems, but at this point I just want to be done -.-
2021-10-21 19:06:26 +00:00
|
|
|
#[clippy::version = "1.44.0"]
|
2020-03-15 17:38:20 +00:00
|
|
|
pub REDUNDANT_PUB_CRATE,
|
2020-03-25 17:09:25 +00:00
|
|
|
nursery,
|
2020-03-15 17:38:20 +00:00
|
|
|
"Using `pub(crate)` visibility on items that are not crate visible due to the visibility of the module that contains them."
|
|
|
|
}
|
|
|
|
|
|
|
|
#[derive(Default)]
|
|
|
|
pub struct RedundantPubCrate {
|
|
|
|
is_exported: Vec<bool>,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl_lint_pass!(RedundantPubCrate => [REDUNDANT_PUB_CRATE]);
|
|
|
|
|
2020-06-25 20:41:36 +00:00
|
|
|
impl<'tcx> LateLintPass<'tcx> for RedundantPubCrate {
|
|
|
|
fn check_item(&mut self, cx: &LateContext<'tcx>, item: &'tcx Item<'tcx>) {
|
2020-03-15 17:38:20 +00:00
|
|
|
if let VisibilityKind::Crate { .. } = item.vis.node {
|
2021-10-04 06:33:40 +00:00
|
|
|
if !cx.access_levels.is_exported(item.def_id) && self.is_exported.last() == Some(&false) {
|
|
|
|
let span = item.span.with_hi(item.ident.span.hi());
|
|
|
|
let descr = cx.tcx.def_kind(item.def_id).descr(item.def_id.to_def_id());
|
|
|
|
span_lint_and_then(
|
|
|
|
cx,
|
|
|
|
REDUNDANT_PUB_CRATE,
|
|
|
|
span,
|
|
|
|
&format!("pub(crate) {} inside private module", descr),
|
|
|
|
|diag| {
|
|
|
|
diag.span_suggestion(
|
|
|
|
item.vis.span,
|
|
|
|
"consider using",
|
|
|
|
"pub".to_string(),
|
|
|
|
Applicability::MachineApplicable,
|
|
|
|
);
|
|
|
|
},
|
|
|
|
);
|
2020-03-15 17:38:20 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if let ItemKind::Mod { .. } = item.kind {
|
2021-07-28 22:07:32 +00:00
|
|
|
self.is_exported.push(cx.access_levels.is_exported(item.def_id));
|
2020-03-15 17:38:20 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-06-25 20:41:36 +00:00
|
|
|
fn check_item_post(&mut self, _cx: &LateContext<'tcx>, item: &'tcx Item<'tcx>) {
|
2020-03-15 17:38:20 +00:00
|
|
|
if let ItemKind::Mod { .. } = item.kind {
|
|
|
|
self.is_exported.pop().expect("unbalanced check_item/check_item_post");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|