Add where lint was set #13801
Merged
Add where lint was set #13801
+207
−71
Conversation
This file contains 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
|
r? @weihanglo rustbot has assigned @weihanglo. Use |
rustbot
added
A-manifest
epage
reviewed
Apr 24, 2024
src/cargo/util/toml/mod.rs
Outdated
| .expect("previously resolved") | ||
| .unwrap_or(&default), | ||
| ); | ||
| let resolved_lints = original_toml |
There was a problem hiding this comment.
Use of original_toml should be for exception cases in to_real_manifest
There was a problem hiding this comment.
Whoops, I must've forgotten to switch that when I was moving this to here
epage
reviewed
Apr 24, 2024
src/cargo/util/lints.rs
Outdated
| .edition_lint_opts | ||
| .filter(|(e, _)| edition >= *e) | ||
| .map(|(_, l)| l); | ||
| impl LevelTrait for Lint { |
There was a problem hiding this comment.
Couldn't this trait have just been function parameters?
There was a problem hiding this comment.
Yes, it could've; I switched it to being a function
epage
reviewed
Apr 24, 2024
| @@ -803,7 +795,7 @@ impl InheritableFields { | |||
| } | |||
|
|
|||
| /// Gets the field `workspace.lint`. | |||
| fn lints(&self) -> CargoResult<manifest::TomlLints> { | |||
| pub fn lints(&self) -> CargoResult<manifest::TomlLints> { | |||
There was a problem hiding this comment.
imo this shouldn't be in InheritableFields anymore because we are no longer treating it like normal inheritance.
Thoughts?
There was a problem hiding this comment.
It is still "Inheritable", it is just not inherited in the normal way. I could go either way on where it should be
Muscraft
force-pushed
the
add-lint-reason
branch
from
a1d6135
to
dfc9bd2
Compare
|
CI failed on Tests macOS x86_64 stable Same reason as #13798 though I thought that failed on Linux. A retry worked |
|
@bors r+ |
bors
added
S-waiting-on-bors
bors
added a commit
that referenced
this pull request
Apr 25, 2024
Add where lint was set `rustc` and `clippy` both show why the lint was emitted and where the level was set the first time it was emitted for a package. We already showed why the list was being emitted but did not show where the lint level was set. This PR adds where the lint was set at.
|
CI is stuck. @bors r- |
bors
added
S-waiting-on-author
|
@bors r=epage |
bors
added
S-waiting-on-bors
bors
added a commit
that referenced
this pull request
Apr 25, 2024
Add where lint was set `rustc` and `clippy` both show why the lint was emitted and where the level was set the first time it was emitted for a package. We already showed why the list was being emitted but did not show where the lint level was set. This PR adds where the lint was set at.
|
💔 Test failed - checks-actions |
bors
added
S-waiting-on-review
|
@bors retry |
bors
added
S-waiting-on-bors
|
☀️ Test successful - checks-actions |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 26, 2024
Update cargo 9 commits in c9392675917adc2edab269eea27c222b5359c637..b60a1555155111e962018007a6d0ef85207db463 2024-04-23 19:35:19 +0000 to 2024-04-26 16:37:29 +0000 - fix(toml): Remove underscore field support in 2024 (rust-lang/cargo#13804) - fix: emit 1.77 syntax error only when msrv is incompatible (rust-lang/cargo#13808) - docs(ref): Index differences between virtual / real manifests (rust-lang/cargo#13794) - refactor(toml): extract dependency-to-source-id to function (rust-lang/cargo#13802) - Add where lint was set (rust-lang/cargo#13801) - fix(toml): Don't double-warn when underscore is used in workspace dep (rust-lang/cargo#13800) - fix(toml): Be more forceful with underscore/dash redundancy (rust-lang/cargo#13798) - Fix warning suppression for config.toml vs config compat symlinks (rust-lang/cargo#13793) - Cleanup linting system (rust-lang/cargo#13797) r? ghost
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 27, 2024
Update cargo 9 commits in c9392675917adc2edab269eea27c222b5359c637..b60a1555155111e962018007a6d0ef85207db463 2024-04-23 19:35:19 +0000 to 2024-04-26 16:37:29 +0000 - fix(toml): Remove underscore field support in 2024 (rust-lang/cargo#13804) - fix: emit 1.77 syntax error only when msrv is incompatible (rust-lang/cargo#13808) - docs(ref): Index differences between virtual / real manifests (rust-lang/cargo#13794) - refactor(toml): extract dependency-to-source-id to function (rust-lang/cargo#13802) - Add where lint was set (rust-lang/cargo#13801) - fix(toml): Don't double-warn when underscore is used in workspace dep (rust-lang/cargo#13800) - fix(toml): Be more forceful with underscore/dash redundancy (rust-lang/cargo#13798) - Fix warning suppression for config.toml vs config compat symlinks (rust-lang/cargo#13793) - Cleanup linting system (rust-lang/cargo#13797) r? ghost
bors
added a commit
that referenced
this pull request
May 3, 2024
fix(lints): Prevent inheritance from bring exposed for published packages #13843 demonstrated a regression caused by #13801, where we started to keep `[lints]` and `[workspace.lints]` separate, and not truly resolve `[lints]`. This was a nice thing to have and made it easier to tell when a lint came from a workspace. The downside of doing so is the lints table would not get resolved when vendoring or publishing. To fix this issue, I reverted the change for keeping `[lints]` and `[workspace.lints]` separate and modified how cargo's linting system figures out where a lint is coming from. Due to this change, we no longer specify that a lint was set by `[workspace.lints]`, only `[lints]`. It is true that a lint level is set by `[lints]` always, as it would've had to specify the lint outright or specify that it was inheriting it, seeing that, I do not think this is a regression in diagnostic quality. I still manage to keep the ability to render a lint's location in the workspace's manifest when running ` analyze_cargo_lints_table`, which I am pleased about.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
rustcandclippyboth show why the lint was emitted and where the level was set the first time it was emitted for a package. We already showed why the list was being emitted but did not show where the lint level was set. This PR adds where the lint was set at.