diff options
| author | bors <bors@rust-lang.org> | 2024-01-04 15:53:14 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-01-04 15:53:14 +0000 |
| commit | 52ae2626f9b3e193314affb0f0cb034793942b67 (patch) | |
| tree | 440770365505e0080ae46b31bd2333253b13b287 | |
| parent | 0bf0b88035563973405676601fde107b84ca3d0c (diff) | |
| parent | 9dcf92649cc3bf4b5152545286ef3be74c196fa4 (diff) | |
| download | rust-52ae2626f9b3e193314affb0f0cb034793942b67.tar.gz rust-52ae2626f9b3e193314affb0f0cb034793942b67.zip | |
Auto merge of #12088 - granddaifuku:fix/metadata-collector-lint-listing, r=Manishearth
fix: metadata-collector lists wrong affected lints fixes #12042 This PR addresses the issue where the `metadata collector` incorrectly generates the `Affected Lints` section when a comma is included in the configuration documentation. I made adjustments; however, if the `/// Lint: SOMETHING` section ends with `.` it always produces the correct output. For example, ```rust /// Lint: PUB_UNDERSCORE_FIELDS ``` should be ```rust /// Lint: PUB_UNDERSCORE_FIELDS. ``` changelog: none
| -rw-r--r-- | clippy_config/src/conf.rs | 2 | ||||
| -rw-r--r-- | clippy_config/src/metadata.rs | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/clippy_config/src/conf.rs b/clippy_config/src/conf.rs index f88ab9fe440..5477d9b83a7 100644 --- a/clippy_config/src/conf.rs +++ b/clippy_config/src/conf.rs @@ -550,7 +550,7 @@ define_Conf! { /// Lint: PUB_UNDERSCORE_FIELDS /// /// Lint "public" fields in a struct that are prefixed with an underscore based on their - /// exported visibility; or whether they are marked as "pub". + /// exported visibility, or whether they are marked as "pub". (pub_underscore_fields_behavior: PubUnderscoreFieldsBehaviour = PubUnderscoreFieldsBehaviour::PublicallyExported), } diff --git a/clippy_config/src/metadata.rs b/clippy_config/src/metadata.rs index 2451fbc91e8..3ba2796e18d 100644 --- a/clippy_config/src/metadata.rs +++ b/clippy_config/src/metadata.rs @@ -96,6 +96,9 @@ fn parse_config_field_doc(doc_comment: &str) -> Option<(Vec<String>, String)> { doc_comment.make_ascii_lowercase(); let lints: Vec<String> = doc_comment .split_off(DOC_START.len()) + .lines() + .next() + .unwrap() .split(", ") .map(str::to_string) .collect(); |
