Skip to content

fallout2: rework clippy_dev & _lints fmt inlining #9527

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 1 commit into from
Sep 24, 2022
Merged

Conversation

nyurik
Copy link
Contributor

@nyurik nyurik commented Sep 24, 2022

Continuing #9525 -- a few more inlining, but this time with some code changes to simplify format strings:

  • Inline format args where possible
  • simplify a few complex macros into format str
  • use formatdoc!() instead format!(indoc!(...))

changelog: none

cc: @llogiq

* Inline format args where possible
* simplify a few complex macros into format str
* use formatdoc!() instead format!(indoc!(...))
@rust-highfive
Copy link

r? @xFrednet

(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 Sep 24, 2022
@llogiq
Copy link
Contributor

llogiq commented Sep 24, 2022

I like the formatdoc! macro. Good simplification wins, too. Thanks!

@bors r+ (sorry @xFrednet for stealing the review)

@bors
Copy link
Contributor

bors commented Sep 24, 2022

📌 Commit cc6b375 has been approved by llogiq

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Sep 24, 2022

⌛ Testing commit cc6b375 with merge 8b1ad17...

@bors
Copy link
Contributor

bors commented Sep 24, 2022

☀️ Test successful - checks-action_dev_test, checks-action_remark_test, checks-action_test
Approved by: llogiq
Pushing 8b1ad17 to master...

@bors bors merged commit 8b1ad17 into rust-lang:master Sep 24, 2022
@nyurik nyurik deleted the inl2 branch September 24, 2022 07:01
bors added a commit that referenced this pull request Oct 4, 2022
fallout: fix tests to allow uninlined_format_args

In order to switch `clippy::uninlined_format_args` from pedantic to style, all existing tests must not raise a warning. I did not want to change the actual tests, so this is a relatively minor change that:

* add `#![allow(clippy::uninlined_format_args)]` where needed
* normalizes all allow/deny/warn attributes
   * all allow attributes are grouped together
   * sorted alphabetically
   * the `clippy::*` attributes are listed separate from the other ones.
   * deny and warn attributes are listed before the allowed ones

See also #9233, #9525, #9527

cc: `@llogiq` `@Alexendoo`

changelog: none
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants