Skip to content

Commit

Permalink
Auto merge of #7026 - daxpedda:cargo-author, r=camsteffen
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
bors committed Apr 5, 2021
2 parents 81f9946 + 5102c9c commit 1a45e43
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 21 deletions.
10 changes: 2 additions & 8 deletions clippy_lints/src/cargo_common_metadata.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,26 +20,24 @@ declare_clippy_lint! {
///
/// **Example:**
/// ```toml
/// # This `Cargo.toml` is missing an authors field:
/// # This `Cargo.toml` is missing a description field:
/// [package]
/// name = "clippy"
/// version = "0.0.212"
/// description = "A bunch of helpful lints to avoid common pitfalls in Rust"
/// repository = "https://github.com/rust-lang/rust-clippy"
/// readme = "README.md"
/// license = "MIT OR Apache-2.0"
/// keywords = ["clippy", "lint", "plugin"]
/// categories = ["development-tools", "development-tools::cargo-plugins"]
/// ```
///
/// Should include an authors field like:
/// Should include a description field like:
///
/// ```toml
/// # This `Cargo.toml` includes all common metadata
/// [package]
/// name = "clippy"
/// version = "0.0.212"
/// authors = ["Someone <someone@rust-lang.org>"]
/// description = "A bunch of helpful lints to avoid common pitfalls in Rust"
/// repository = "https://github.com/rust-lang/rust-clippy"
/// readme = "README.md"
Expand Down Expand Up @@ -97,10 +95,6 @@ impl LateLintPass<'_> for CargoCommonMetadata {
// only run the lint if publish is `None` (`publish = true` or skipped entirely)
// or if the vector isn't empty (`publish = ["something"]`)
if package.publish.as_ref().filter(|publish| publish.is_empty()).is_none() || self.ignore_publish {
if is_empty_vec(&package.authors) {
missing_warning(cx, &package, "package.authors");
}

if is_empty_str(&package.description) {
missing_warning(cx, &package, "package.description");
}
Expand Down
6 changes: 2 additions & 4 deletions tests/ui-cargo/cargo_common_metadata/fail/src/main.stderr
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
error: package `cargo_common_metadata` is missing `package.authors` metadata
error: package `cargo_common_metadata` is missing `package.description` metadata
|
= note: `-D clippy::cargo-common-metadata` implied by `-D warnings`

error: package `cargo_common_metadata` is missing `package.description` metadata

error: package `cargo_common_metadata` is missing `either package.license or package.license_file` metadata

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

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

error: aborting due to 7 previous errors
error: aborting due to 6 previous errors

Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
error: package `cargo_common_metadata` is missing `package.authors` metadata
error: package `cargo_common_metadata` is missing `package.description` metadata
|
= note: `-D clippy::cargo-common-metadata` implied by `-D warnings`

error: package `cargo_common_metadata` is missing `package.description` metadata

error: package `cargo_common_metadata` is missing `either package.license or package.license_file` metadata

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

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

error: aborting due to 7 previous errors
error: aborting due to 6 previous errors

Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
error: package `cargo_common_metadata` is missing `package.authors` metadata
error: package `cargo_common_metadata` is missing `package.description` metadata
|
= note: `-D clippy::cargo-common-metadata` implied by `-D warnings`

error: package `cargo_common_metadata` is missing `package.description` metadata

error: package `cargo_common_metadata` is missing `either package.license or package.license_file` metadata

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

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

error: aborting due to 7 previous errors
error: aborting due to 6 previous errors

1 change: 0 additions & 1 deletion tests/ui-cargo/cargo_common_metadata/pass/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
name = "cargo_common_metadata"
version = "0.1.0"
publish = false
authors = ["Random person from the Internet <someone@someplace.org>"]
description = "A test package for the cargo_common_metadata lint"
repository = "https://github.com/someone/cargo_common_metadata"
readme = "README.md"
Expand Down

0 comments on commit 1a45e43

Please sign in to comment.