-
Notifications
You must be signed in to change notification settings - Fork 2.8k
feat(lints): Add redundant_homepage lint #16561
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
+295
−0
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,156 @@ | ||
| use std::path::Path; | ||
|
|
||
| use annotate_snippets::AnnotationKind; | ||
| use annotate_snippets::Group; | ||
| use annotate_snippets::Level; | ||
| use annotate_snippets::Origin; | ||
| use annotate_snippets::Patch; | ||
| use annotate_snippets::Snippet; | ||
| use cargo_util_schemas::manifest::InheritableField; | ||
| use cargo_util_schemas::manifest::TomlToolLints; | ||
|
|
||
| use crate::CargoResult; | ||
| use crate::GlobalContext; | ||
| use crate::core::Package; | ||
| use crate::lints::Lint; | ||
| use crate::lints::LintLevel; | ||
| use crate::lints::LintLevelReason; | ||
| use crate::lints::STYLE; | ||
| use crate::lints::get_key_value_span; | ||
| use crate::lints::rel_cwd_manifest_path; | ||
|
|
||
| pub const LINT: Lint = Lint { | ||
| name: "redundant_homepage", | ||
| desc: "`package.homepage` is redundant with another manifest field", | ||
| primary_group: &STYLE, | ||
| edition_lint_opts: None, | ||
| feature_gate: None, | ||
| docs: Some( | ||
| r#" | ||
| ### What it does | ||
|
|
||
| Checks if the value of `package.homepage` is already covered by another field. | ||
|
|
||
| See also [`package.homepage` reference documentation](manifest.md#the-homepage-field). | ||
|
|
||
| ### Why it is bad | ||
|
|
||
| When package browsers render each link, a redundant link adds visual noise. | ||
|
|
||
| ### Drawbacks | ||
|
|
||
| ### Example | ||
|
|
||
| ```toml | ||
| [package] | ||
| name = "foo" | ||
| homepage = "https://github.com/rust-lang/cargo/" | ||
| repository = "https://github.com/rust-lang/cargo/" | ||
| ``` | ||
|
|
||
| Should be written as: | ||
|
|
||
| ```toml | ||
| [package] | ||
| name = "foo" | ||
| repository = "https://github.com/rust-lang/cargo/" | ||
| ``` | ||
| "#, | ||
| ), | ||
| }; | ||
|
|
||
| pub fn redundant_homepage( | ||
| pkg: &Package, | ||
| manifest_path: &Path, | ||
| cargo_lints: &TomlToolLints, | ||
| error_count: &mut usize, | ||
| gctx: &GlobalContext, | ||
| ) -> CargoResult<()> { | ||
| let (lint_level, reason) = LINT.level( | ||
| cargo_lints, | ||
| pkg.manifest().edition(), | ||
| pkg.manifest().unstable_features(), | ||
| ); | ||
|
|
||
| if lint_level == LintLevel::Allow { | ||
| return Ok(()); | ||
| } | ||
|
|
||
| let manifest_path = rel_cwd_manifest_path(manifest_path, gctx); | ||
|
|
||
| lint_package(pkg, &manifest_path, lint_level, reason, error_count, gctx) | ||
| } | ||
|
|
||
| pub fn lint_package( | ||
| pkg: &Package, | ||
| manifest_path: &str, | ||
| lint_level: LintLevel, | ||
| reason: LintLevelReason, | ||
| error_count: &mut usize, | ||
| gctx: &GlobalContext, | ||
| ) -> CargoResult<()> { | ||
| let manifest = pkg.manifest(); | ||
|
|
||
| let Some(normalized_pkg) = &manifest.normalized_toml().package else { | ||
| return Ok(()); | ||
| }; | ||
| let Some(InheritableField::Value(homepage)) = &normalized_pkg.homepage else { | ||
| return Ok(()); | ||
| }; | ||
|
|
||
| let other_field = if let Some(InheritableField::Value(repository)) = &normalized_pkg.repository | ||
| && repository == homepage | ||
| { | ||
| "repository" | ||
| } else if let Some(InheritableField::Value(documentation)) = &normalized_pkg.documentation | ||
| && documentation == homepage | ||
| { | ||
| "documentation" | ||
| } else { | ||
| return Ok(()); | ||
| }; | ||
|
|
||
| let document = manifest.document(); | ||
| let contents = manifest.contents(); | ||
| let level = lint_level.to_diagnostic_level(); | ||
| let emitted_source = LINT.emitted_source(lint_level, reason); | ||
|
|
||
| let mut primary = Group::with_title(level.primary_title(LINT.desc)); | ||
| if let Some(document) = document | ||
| && let Some(contents) = contents | ||
| && let Some(span) = get_key_value_span(document, &["package", "homepage"]) | ||
| { | ||
| let mut snippet = Snippet::source(contents) | ||
| .path(manifest_path) | ||
| .annotation(AnnotationKind::Primary.span(span.value)); | ||
| if let Some(span) = get_key_value_span(document, &["package", other_field]) { | ||
| snippet = snippet.annotation(AnnotationKind::Context.span(span.value)); | ||
| } | ||
| primary = primary.element(snippet); | ||
| } else { | ||
| primary = primary.element(Origin::path(manifest_path)); | ||
| } | ||
| primary = primary.element(Level::NOTE.message(emitted_source)); | ||
| let mut report = vec![primary]; | ||
| if let Some(document) = document | ||
| && let Some(contents) = contents | ||
| && let Some(span) = get_key_value_span(document, &["package", "homepage"]) | ||
| { | ||
| let mut help = | ||
| Group::with_title(Level::HELP.secondary_title("consider removing `package.homepage`")); | ||
| let span = span.key.start..span.value.end; | ||
| help = help.element( | ||
| Snippet::source(contents) | ||
| .path(manifest_path) | ||
| .patch(Patch::new(span, "")), | ||
| ); | ||
| report.push(help); | ||
| } | ||
|
|
||
| if lint_level.is_error() { | ||
| *error_count += 1; | ||
| } | ||
| gctx.shell().print_report(&report, lint_level.force())?; | ||
|
|
||
| Ok(()) | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| use crate::prelude::*; | ||
| use cargo_test_support::project; | ||
| use cargo_test_support::str; | ||
|
|
||
| #[cargo_test] | ||
| fn with_repo() { | ||
| let p = project() | ||
| .file( | ||
| "Cargo.toml", | ||
| r#" | ||
| [package] | ||
| name = "cargo" | ||
| version = "0.0.1" | ||
| edition = "2015" | ||
| repository = "https://github.com/rust-lang/cargo/" | ||
| homepage = "https://github.com/rust-lang/cargo/" | ||
|
|
||
| [lints.cargo] | ||
| redundant_homepage = "warn" | ||
| "#, | ||
| ) | ||
| .file("src/main.rs", "fn main() {}") | ||
| .file("README.md", "") | ||
| .build(); | ||
|
|
||
| p.cargo("check -Zcargo-lints") | ||
| .masquerade_as_nightly_cargo(&["cargo-lints"]) | ||
| .with_stderr_data(str![[r#" | ||
| [WARNING] `package.homepage` is redundant with another manifest field | ||
| --> Cargo.toml:7:12 | ||
| | | ||
| 6 | repository = "https://github.com/rust-lang/cargo/" | ||
| | ------------------------------------- | ||
| 7 | homepage = "https://github.com/rust-lang/cargo/" | ||
| | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ||
| | | ||
| = [NOTE] `cargo::redundant_homepage` is set to `warn` in `[lints]` | ||
| [HELP] consider removing `package.homepage` | ||
| | | ||
| 7 - homepage = "https://github.com/rust-lang/cargo/" | ||
| | | ||
| [CHECKING] cargo v0.0.1 ([ROOT]/foo) | ||
| [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s | ||
|
|
||
| "#]]) | ||
| .run(); | ||
| } | ||
|
|
||
| #[cargo_test] | ||
| fn with_docs() { | ||
| let p = project() | ||
| .file( | ||
| "Cargo.toml", | ||
| r#" | ||
| [package] | ||
| name = "cargo" | ||
| version = "0.0.1" | ||
| edition = "2015" | ||
| documentation = "https://docs.rs/cargo/latest/cargo/" | ||
| homepage = "https://docs.rs/cargo/latest/cargo/" | ||
|
|
||
| [lints.cargo] | ||
| redundant_homepage = "warn" | ||
| "#, | ||
| ) | ||
| .file("src/main.rs", "fn main() {}") | ||
| .file("README.md", "") | ||
| .build(); | ||
|
|
||
| p.cargo("check -Zcargo-lints") | ||
| .masquerade_as_nightly_cargo(&["cargo-lints"]) | ||
| .with_stderr_data(str![[r#" | ||
| [WARNING] `package.homepage` is redundant with another manifest field | ||
| --> Cargo.toml:7:12 | ||
| | | ||
| 6 | documentation = "https://docs.rs/cargo/latest/cargo/" | ||
| | ------------------------------------- | ||
| 7 | homepage = "https://docs.rs/cargo/latest/cargo/" | ||
| | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ||
| | | ||
| = [NOTE] `cargo::redundant_homepage` is set to `warn` in `[lints]` | ||
| [HELP] consider removing `package.homepage` | ||
| | | ||
| 7 - homepage = "https://docs.rs/cargo/latest/cargo/" | ||
| | | ||
| [CHECKING] cargo v0.0.1 ([ROOT]/foo) | ||
| [FINISHED] `dev` profile [unoptimized + debuginfo] target(s) in [ELAPSED]s | ||
|
|
||
| "#]]) | ||
| .run(); | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I remembered now that we should check workspace inheritance for this lint, as well as for
redundant_readme. Do we want to address it in this PR, or we merge this and fix them in follow-up?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's merge and I'll handle it in a follow up just so this doesn't sit rotting