Skip to content

Commit f0d3fd7

Browse files
committed
Implement _cargo_ignore_publish.
1 parent d4bc7d2 commit f0d3fd7

File tree

5 files changed

+23
-5
lines changed

5 files changed

+23
-5
lines changed

clippy_lints/src/cargo_common_metadata.rs

+17-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use std::path::PathBuf;
55
use crate::utils::{run_lints, span_lint};
66
use rustc_hir::{hir_id::CRATE_HIR_ID, Crate};
77
use rustc_lint::{LateContext, LateLintPass};
8-
use rustc_session::{declare_lint_pass, declare_tool_lint};
8+
use rustc_session::{declare_tool_lint, impl_lint_pass};
99
use rustc_span::source_map::DUMMY_SP;
1010

1111
declare_clippy_lint! {
@@ -51,6 +51,21 @@ declare_clippy_lint! {
5151
"common metadata is defined in `Cargo.toml`"
5252
}
5353

54+
#[derive(Copy, Clone, Debug)]
55+
pub struct CargoCommonMetadata {
56+
ignore_publish: bool,
57+
}
58+
59+
impl CargoCommonMetadata {
60+
pub fn new(ignore_publish: bool) -> Self {
61+
Self { ignore_publish }
62+
}
63+
}
64+
65+
impl_lint_pass!(CargoCommonMetadata => [
66+
CARGO_COMMON_METADATA
67+
]);
68+
5469
fn missing_warning(cx: &LateContext<'_>, package: &cargo_metadata::Package, field: &str) {
5570
let message = format!("package `{}` is missing `{}` metadata", package.name, field);
5671
span_lint(cx, CARGO_COMMON_METADATA, DUMMY_SP, &message);
@@ -69,8 +84,6 @@ fn is_empty_vec(value: &[String]) -> bool {
6984
value.iter().all(String::is_empty)
7085
}
7186

72-
declare_lint_pass!(CargoCommonMetadata => [CARGO_COMMON_METADATA]);
73-
7487
impl LateLintPass<'_> for CargoCommonMetadata {
7588
fn check_crate(&mut self, cx: &LateContext<'_>, _: &Crate<'_>) {
7689
if !run_lints(cx, &[CARGO_COMMON_METADATA], CRATE_HIR_ID) {
@@ -80,7 +93,7 @@ impl LateLintPass<'_> for CargoCommonMetadata {
8093
let metadata = unwrap_cargo_metadata!(cx, CARGO_COMMON_METADATA, false);
8194

8295
for package in metadata.packages {
83-
if package.publish.as_ref().filter(|publish| publish.is_empty()).is_none() {
96+
if package.publish.as_ref().filter(|publish| publish.is_empty()).is_none() || self.ignore_publish {
8497
if is_empty_vec(&package.authors) {
8598
missing_warning(cx, &package, "package.authors");
8699
}

clippy_lints/src/lib.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1180,7 +1180,8 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf:
11801180
store.register_early_pass(|| box redundant_else::RedundantElse);
11811181
store.register_late_pass(|| box create_dir::CreateDir);
11821182
store.register_early_pass(|| box needless_arbitrary_self_type::NeedlessArbitrarySelfType);
1183-
store.register_late_pass(|| box cargo_common_metadata::CargoCommonMetadata);
1183+
let cargo_ignore_publish = conf._cargo_ignore_publish;
1184+
store.register_late_pass(move || box cargo_common_metadata::CargoCommonMetadata::new(cargo_ignore_publish));
11841185
store.register_late_pass(|| box multiple_crate_versions::MultipleCrateVersions);
11851186
store.register_late_pass(|| box wildcard_dependencies::WildcardDependencies);
11861187
let literal_representation_lint_fraction_readability = conf.unreadable_literal_lint_fractions;

clippy_lints/src/utils/conf.rs

+2
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,8 @@ define_Conf! {
173173
(disallowed_methods, "disallowed_methods": Vec<String>, Vec::<String>::new()),
174174
/// Lint: UNREADABLE_LITERAL. Should the fraction of a decimal be linted to include separators.
175175
(unreadable_literal_lint_fractions, "unreadable_literal_lint_fractions": bool, true),
176+
/// Lint: CARGO_COMMON_METADATA. For internal testing only, ignores the current `publish` settings in the Cargo manifest.
177+
(_cargo_ignore_publish, "_cargo_ignore_publish": bool, false),
176178
}
177179

178180
impl Default for Conf {

tests/ui-cargo/cargo_common_metadata/pass/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
[package]
22
name = "cargo_common_metadata"
33
version = "0.1.0"
4+
publish = false
45
authors = ["Random person from the Internet <[email protected]>"]
56
description = "A test package for the cargo_common_metadata lint"
67
repository = "https://github.com/someone/cargo_common_metadata"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
_cargo_ignore_publish = true

0 commit comments

Comments
 (0)