Skip to content
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

Updates to future-incompatible reporting. #9606

Merged
merged 6 commits into from
Jun 21, 2021

Conversation

ehuss
Copy link
Contributor

@ehuss ehuss commented Jun 20, 2021

This includes several changes to future-incompatible reports:

  • Now able to retain multiple reports on disk (currently 5).
  • cargo report future-incompatibilities will now show the last report without --id.
  • Changed cargo report future-incompatibilities to display the report on stdout. Although these are "diagnostics", I see this more as a human-readable "report", which might benefit from being more easily piped (like to a pager). I also expect all other report subcommands to print to stdout.
  • Fixed a bug where saving the reports to disk was not truncating the file. If multiple reports were saved, and future ones were shorter than a previous one, the on-disk structure would be corrupted.
  • Reports are now always stored with ANSI escape codes, and the color filtering is done only when displayed.
  • Some slight adjustments to the formatting of the report.
  • When the wrong --id is passed, show available reports.
  • Give a slightly better error message when there are no reports.
  • Fixed bug where "0 dependencies has warnings" was unconditionally displayed (it should only be displayed if --future-incompat-report is used)
  • Added future-incompat as an alias for the future-incompatibilities subcommand which can be quite a verbose command.
  • When showing the note at the end of the build, make sure the list is unique (for example, if a single package had multiple targets that trigger a warning).
  • Added a note at the bottom of the report that indicates if newer versions of a package are available.

@rust-highfive
Copy link

r? @alexcrichton

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 20, 2021
@ehuss ehuss force-pushed the future-incompat-enhancements branch from c152e6c to 836adce Compare June 20, 2021 23:49
Copy link
Member

@alexcrichton alexcrichton left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice updates!

src/cargo/core/compiler/future_incompat.rs Outdated Show resolved Hide resolved
src/cargo/core/compiler/future_incompat.rs Show resolved Hide resolved
src/cargo/core/compiler/future_incompat.rs Outdated Show resolved Hide resolved
@bors
Copy link
Collaborator

bors commented Jun 21, 2021

☔ The latest upstream changes (presumably #9602) made this pull request unmergeable. Please resolve the merge conflicts.

@ehuss ehuss force-pushed the future-incompat-enhancements branch from 836adce to a93bfcb Compare June 21, 2021 16:50
@alexcrichton
Copy link
Member

@bors: r+

Looks good to me! I think we can tweak the error message perhaps once we see some in the wild and do some updates if it looks like it's frequently necessary to do so

@bors
Copy link
Collaborator

bors commented Jun 21, 2021

📌 Commit afe7314 has been approved by alexcrichton

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 21, 2021
@bors
Copy link
Collaborator

bors commented Jun 21, 2021

⌛ Testing commit afe7314 with merge 8130be7...

@bors
Copy link
Collaborator

bors commented Jun 21, 2021

☀️ Test successful - checks-actions
Approved by: alexcrichton
Pushing 8130be7 to master...

@bors bors merged commit 8130be7 into rust-lang:master Jun 21, 2021
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Jun 24, 2021
Update cargo

This also updates `opener` used in bootstrap (to try to keep dependencies unified).

18 commits in 44456677b5d1d82fe981c955dc5c67734b31f340..9233aa06c801801cff75df65df718d70905a235e
2021-06-12 18:00:01 +0000 to 2021-06-22 21:32:55 +0000
- Detect incorrectly named cargo.toml (rust-lang/cargo#9607)
- Unify weak and namespaced features. (rust-lang/cargo#9574)
- Change `rustc-cdylib-link-arg` error to a warning. (rust-lang/cargo#9563)
- Updates to future-incompatible reporting. (rust-lang/cargo#9606)
- Add a compatibility notice for diesel and the new resolver. (rust-lang/cargo#9602)
- Don't allow config env to modify vars set by cargo (rust-lang/cargo#9579)
- Disambiguate is_symlink. (rust-lang/cargo#9604)
- Update opener requirement from 0.4 to 0.5 (rust-lang/cargo#9583)
- Avoid quadratic complexity when splitting output into lines (rust-lang/cargo#9586)
- Bump to 0.56.0, update changelog (rust-lang/cargo#9597)
- Fix dep-info files including non-local build script paths. (rust-lang/cargo#9596)
- Relax doc collision error. (rust-lang/cargo#9595)
- Handle "jobs = 0" case in cargo config files (rust-lang/cargo#9584)
- Enhancements to testsuite error output. (rust-lang/cargo#9589)
- Fix typo (rust-lang/cargo#9590)
- Enable support for fix --edition for 2021. (rust-lang/cargo#9588)
- Add more details for installing git repository errors (rust-lang/cargo#9582)
- More information for links conflicting (rust-lang/cargo#9568)
@ehuss ehuss added this to the 1.55.0 milestone Feb 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants