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.

Sign up for GitHub

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

Jump to bottom

Flatten/inline format_args!() and (string and int) literal arguments into format_args!() #106824

Merged
merged 16 commits into from
Mar 16, 2023
Merged

Flatten/inline format_args!() and (string and int) literal arguments into format_args!() #106824

merged 16 commits into from
Mar 16, 2023

Commits on Mar 16, 2023

  1. Flatten nested format_args!() into one.

    @m-ou-se
    m-ou-se committed Mar 16, 2023
    Configuration menu
    Copy the full SHA
    a769b30 View commit details
    Browse the repository at this point in the history

  2. Coalesce adjacent literal pieces in expand_format_args.

    @m-ou-se
    m-ou-se committed Mar 16, 2023
    Configuration menu
    Copy the full SHA
    94ad7e8 View commit details
    Browse the repository at this point in the history

  3. Inline string literals into format_args!().

    @m-ou-se
    m-ou-se committed Mar 16, 2023
    Configuration menu
    Copy the full SHA
    85ef2f0 View commit details
    Browse the repository at this point in the history

  4. Support flattening/inlining format_args through & and (). 

    E.g. format_args!("{}", &(format_args!("abc"))).
    @m-ou-se
    m-ou-se committed Mar 16, 2023
    Configuration menu
    Copy the full SHA
    caa6ba9 View commit details
    Browse the repository at this point in the history

  5. Only inline {} string literals in format_args. 

    Placeholders like {:123} would incorrectly get inlined.
    @m-ou-se
    m-ou-se committed Mar 16, 2023
    Configuration menu
    Copy the full SHA
    b7678d4 View commit details
    Browse the repository at this point in the history

  6. Fix argument index remapping in format_args flattening.

    @m-ou-se
    m-ou-se committed Mar 16, 2023
    Configuration menu
    Copy the full SHA
    b6c988b View commit details
    Browse the repository at this point in the history

  7. Remove unreachable branch in format_args ast lowering.

    @m-ou-se
    m-ou-se committed Mar 16, 2023
    Configuration menu
    Copy the full SHA
    0554401 View commit details
    Browse the repository at this point in the history

  8. Check all arg indexes before removing inlined format args.

    @m-ou-se
    m-ou-se committed Mar 16, 2023
    Configuration menu
    Copy the full SHA
    df8c14c View commit details
    Browse the repository at this point in the history

  9. Also inline integer literals into format_args!().

    @m-ou-se
    m-ou-se committed Mar 16, 2023
    Configuration menu
    Copy the full SHA
    6a535df View commit details
    Browse the repository at this point in the history

  10. Update format_args!() test to account for inlining.

    @m-ou-se
    m-ou-se committed Mar 16, 2023
    Configuration menu
    Copy the full SHA
    96d2521 View commit details
    Browse the repository at this point in the history

  11. Don't allow new const panic through format flattening. 

    panic!("a {}", "b") is still not allowed in const,
even if the hir flattens to panic!("a b").
    @m-ou-se
    m-ou-se committed Mar 16, 2023
    Configuration menu
    Copy the full SHA
    f2f6bcc View commit details
    Browse the repository at this point in the history

  12. Bless pretty tests.

    @m-ou-se
    m-ou-se committed Mar 16, 2023
    Configuration menu
    Copy the full SHA
    1d59081 View commit details
    Browse the repository at this point in the history

  13. Gate fmt args flattening behind -Zflatten-format-args.

    @m-ou-se
    m-ou-se committed Mar 16, 2023
    Configuration menu
    Copy the full SHA
    995e57b View commit details
    Browse the repository at this point in the history

  14. Fix clippy.

    @m-ou-se
    m-ou-se committed Mar 16, 2023
    Configuration menu
    Copy the full SHA
    653124a View commit details
    Browse the repository at this point in the history

  15. Add test for -Zflatten-format-args=yes.

    @m-ou-se
    m-ou-se committed Mar 16, 2023
    Configuration menu
    Copy the full SHA
    4d84022 View commit details
    Browse the repository at this point in the history

  16. Bless -Zhelp output test.

    @m-ou-se
    m-ou-se committed Mar 16, 2023
    Configuration menu
    Copy the full SHA
    a080165 View commit details
    Browse the repository at this point in the history