Skip to content

Commit 1a45e43

Browse files
committed
Auto merge of rust-lang#7026 - daxpedda:cargo-author, r=camsteffen
Remove author requirement for `cargo_common_metadata` This PR follows rust-lang/cargo#9282, I'm not fully informed about all of this, it would be great if somebody knowledgeable about this topic agrees. changelog: Changed `cargo_common_metadata` to stop linting on the optional author field.
2 parents 81f9946 + 5102c9c commit 1a45e43

File tree

5 files changed

+8
-21
lines changed

5 files changed

+8
-21
lines changed

clippy_lints/src/cargo_common_metadata.rs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,26 +20,24 @@ declare_clippy_lint! {
2020
///
2121
/// **Example:**
2222
/// ```toml
23-
/// # This `Cargo.toml` is missing an authors field:
23+
/// # This `Cargo.toml` is missing a description field:
2424
/// [package]
2525
/// name = "clippy"
2626
/// version = "0.0.212"
27-
/// description = "A bunch of helpful lints to avoid common pitfalls in Rust"
2827
/// repository = "https://github.com/rust-lang/rust-clippy"
2928
/// readme = "README.md"
3029
/// license = "MIT OR Apache-2.0"
3130
/// keywords = ["clippy", "lint", "plugin"]
3231
/// categories = ["development-tools", "development-tools::cargo-plugins"]
3332
/// ```
3433
///
35-
/// Should include an authors field like:
34+
/// Should include a description field like:
3635
///
3736
/// ```toml
3837
/// # This `Cargo.toml` includes all common metadata
3938
/// [package]
4039
/// name = "clippy"
4140
/// version = "0.0.212"
42-
/// authors = ["Someone <[email protected]>"]
4341
/// description = "A bunch of helpful lints to avoid common pitfalls in Rust"
4442
/// repository = "https://github.com/rust-lang/rust-clippy"
4543
/// readme = "README.md"
@@ -97,10 +95,6 @@ impl LateLintPass<'_> for CargoCommonMetadata {
9795
// only run the lint if publish is `None` (`publish = true` or skipped entirely)
9896
// or if the vector isn't empty (`publish = ["something"]`)
9997
if package.publish.as_ref().filter(|publish| publish.is_empty()).is_none() || self.ignore_publish {
100-
if is_empty_vec(&package.authors) {
101-
missing_warning(cx, &package, "package.authors");
102-
}
103-
10498
if is_empty_str(&package.description) {
10599
missing_warning(cx, &package, "package.description");
106100
}
Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
error: package `cargo_common_metadata` is missing `package.authors` metadata
1+
error: package `cargo_common_metadata` is missing `package.description` metadata
22
|
33
= note: `-D clippy::cargo-common-metadata` implied by `-D warnings`
44

5-
error: package `cargo_common_metadata` is missing `package.description` metadata
6-
75
error: package `cargo_common_metadata` is missing `either package.license or package.license_file` metadata
86

97
error: package `cargo_common_metadata` is missing `package.repository` metadata
@@ -14,5 +12,5 @@ error: package `cargo_common_metadata` is missing `package.keywords` metadata
1412

1513
error: package `cargo_common_metadata` is missing `package.categories` metadata
1614

17-
error: aborting due to 7 previous errors
15+
error: aborting due to 6 previous errors
1816

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
error: package `cargo_common_metadata` is missing `package.authors` metadata
1+
error: package `cargo_common_metadata` is missing `package.description` metadata
22
|
33
= note: `-D clippy::cargo-common-metadata` implied by `-D warnings`
44

5-
error: package `cargo_common_metadata` is missing `package.description` metadata
6-
75
error: package `cargo_common_metadata` is missing `either package.license or package.license_file` metadata
86

97
error: package `cargo_common_metadata` is missing `package.repository` metadata
@@ -14,5 +12,5 @@ error: package `cargo_common_metadata` is missing `package.keywords` metadata
1412

1513
error: package `cargo_common_metadata` is missing `package.categories` metadata
1614

17-
error: aborting due to 7 previous errors
15+
error: aborting due to 6 previous errors
1816

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
error: package `cargo_common_metadata` is missing `package.authors` metadata
1+
error: package `cargo_common_metadata` is missing `package.description` metadata
22
|
33
= note: `-D clippy::cargo-common-metadata` implied by `-D warnings`
44

5-
error: package `cargo_common_metadata` is missing `package.description` metadata
6-
75
error: package `cargo_common_metadata` is missing `either package.license or package.license_file` metadata
86

97
error: package `cargo_common_metadata` is missing `package.repository` metadata
@@ -14,5 +12,5 @@ error: package `cargo_common_metadata` is missing `package.keywords` metadata
1412

1513
error: package `cargo_common_metadata` is missing `package.categories` metadata
1614

17-
error: aborting due to 7 previous errors
15+
error: aborting due to 6 previous errors
1816

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
name = "cargo_common_metadata"
33
version = "0.1.0"
44
publish = false
5-
authors = ["Random person from the Internet <[email protected]>"]
65
description = "A test package for the cargo_common_metadata lint"
76
repository = "https://github.com/someone/cargo_common_metadata"
87
readme = "README.md"

0 commit comments

Comments
 (0)