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

Rollup of 7 pull requests #118857

Merged
merged 28 commits into from
Dec 12, 2023
Merged

Rollup of 7 pull requests #118857

merged 28 commits into from
Dec 12, 2023

Commits on Nov 21, 2023

  1. Configuration menu
    Copy the full SHA
    16768e5 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    ce0051a View commit details
    Browse the repository at this point in the history
  3. Report missing licenses or copyright text.

    Required because spdx-rs 0.5.3 added support for SPDX  2.3 documents and made these fields optional.
    jonathanpallant committed Nov 21, 2023
    Configuration menu
    Copy the full SHA
    d45eac3 View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2023

  1. Configuration menu
    Copy the full SHA
    c6eb03b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    daf6121 View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2023

  1. Fix generate-copyright tool.

    LLVM copyrights are now condensed to those reported in the .reuse/dep5 file.
    jonathanpallant committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    2d1cd45 View commit details
    Browse the repository at this point in the history
  2. Add missing CC-BY-SA-4.0.

    A `reuse --include-submodules lint` now passes.
    jonathanpallant committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    7a49ac5 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    c1577e5 View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2023

  1. Change LLVM reuse dep5 line to say AND.

    The LLVM project is a combination of some NCSA licensed files and some Apache-2.0 WITH LLVM-exception licensed files, so you should follow both licences when using the combined work.
    
    Also clarified where I got the copyright years and git hash from.
    jonathanpallant committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    efa4416 View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2023

  1. Configuration menu
    Copy the full SHA
    9f0c6f1 View commit details
    Browse the repository at this point in the history
  2. use magenta instead of bold for highlighting

    according to a poll of gay people in my phone, purple is the most popular color to use for highlighting
    
    | color      | percentage |
    | ---------- | ---------- |
    | bold white | 6%         |
    | blue       | 14%        |
    | cyan       | 26%        |
    | purple     | 37%        |
    | magenta    | 17%        |
    
    unfortunately, purple is not supported by 16-color terminals, which rustc apparently wants to support for some reason.
    until we require support for full 256-color terms (e.g. by doing the same feature detection as we currently do for urls), we can't use it.
    
    instead, i have collapsed the purple votes into magenta on the theory that they're close, and also because magenta is pretty.
    jyn514 committed Dec 8, 2023
    Configuration menu
    Copy the full SHA
    96b027f View commit details
    Browse the repository at this point in the history

Commits on Dec 9, 2023

  1. use different revisions for testing colors on windows

    this is kinda jank because it means people need both machines to bless the tests
    jyn514 committed Dec 9, 2023
    Configuration menu
    Copy the full SHA
    32e48fc View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2023

  1. Configuration menu
    Copy the full SHA
    eba02ab View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0564de1 View commit details
    Browse the repository at this point in the history
  3. End locals' live range before suspending coroutine

    State transforms retains storage statements for locals that are not
    stored inside a coroutine. It ensures those locals are live when
    resuming by inserting StorageLive as appropriate. It forgot to end the
    storage of those locals when suspending, which is fixed here.
    
    While the end of live range is implicit when executing return, it is
    nevertheless useful for inliner which would otherwise extend the live
    range beyond return.
    tmiasko committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    ef1831a View commit details
    Browse the repository at this point in the history
  4. Remove redundant special case for resume argument

    The special case is subsumed by the check for always live locals that
    follows it.
    tmiasko committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    eaaa290 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    0a65dd3 View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2023

  1. Fix BinOp ty assertion and fn_sig for closures

    Also added a few more util methods to TyKind to check for specific types.
    celinval committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    2f790af View commit details
    Browse the repository at this point in the history
  2. Fix doc comment

    celinval committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    3b97b51 View commit details
    Browse the repository at this point in the history
  3. Wesley is not on vacation

    All good things...
    wesleywiser committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    b9d9cc5 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    638b08e View commit details
    Browse the repository at this point in the history
  5. Rollup merge of rust-lang#118445 - ferrocene:jp-support-reuse-in-subm…

    …odules, r=Mark-Simulacrum
    
    Let `reuse` look inside git submodules
    
    Changes `collect-license-metadata` and `generate-copyright` so they can now look at the git submodules.
    
    Unfortunately `reuse` chokes on the LLVM submodule - it finds the word "Copyright" or the unicode copyright symbol in all kinds of places, including UTF-8 test cases. The `reuse` tool expressly won't let you ignore folders, so we let it scan everything and then strip out the LLVM sub-folder in post. Instead, we add in a hand-curated list of copyright information gleaned by reading the LLVM codebase carefully, which is stored in `.reuse/dep5` in Debian format where `reuse` can find and use it.
    
    The `.reuse/dep5` continues to track copyright info for files in the tree that do not have SPDX metadata in them (i.e. all of them)
    matthiaskrgr committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    1ee8327 View commit details
    Browse the repository at this point in the history
  6. Rollup merge of rust-lang#118756 - jyn514:colors, r=estebank

    use bold magenta instead of bold white for highlighting
    
    according to a poll of gay people in my phone, purple is the most popular color to use for highlighting
    
    | color      | percentage |
    | ---------- | ---------- |
    | bold white | 6%         |
    | blue       | 14%        |
    | cyan       | 26%        |
    | purple     | 37%        |
    | magenta    | 17%        |
    
    unfortunately, purple is not supported by 16-color terminals, which rustc apparently wants to support for some reason.
    until we require support for full 256-color terms (e.g. by doing the same feature detection as we currently do for urls), we can't use it.
    
    instead, i have collapsed the purple votes into magenta on the theory that they're close, and also because magenta is pretty.
    
    before:
    ![image](https://github.com/rust-lang/rust/assets/23638587/9a89eee2-8b89-422e-8554-812827bb2a23)
    
    after:
    ![image](https://github.com/rust-lang/rust/assets/23638587/5bf3a917-8a20-4afd-af3e-f9491d0d57f5)
    
    other colors for comparison:
    blue: ![image](https://github.com/rust-lang/rust/assets/23638587/6f199c7b-d598-4009-8ffc-6b7b1d0d1f8c)
    cyan: ![image](https://github.com/rust-lang/rust/assets/23638587/a77e4fe3-563e-4aa5-ae92-745bb67287d1)
    purple: ![image](https://github.com/rust-lang/rust/assets/23638587/ffe603fb-d811-4106-95a9-4dd4c955924c)
    magenta without bolding: ![image](https://github.com/rust-lang/rust/assets/23638587/cf927e5f-8b25-4dc2-b8e7-32905a11a459)
    
    r? ``@estebank``
    matthiaskrgr committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    dfc5ffa View commit details
    Browse the repository at this point in the history
  7. Rollup merge of rust-lang#118797 - tmiasko:dead-coro, r=davidtwco

    End locals' live range before suspending coroutine
    
    State transforms retains storage statements for locals that are not
    stored inside a coroutine. It ensures those locals are live when
    resuming by inserting StorageLive as appropriate. It forgot to end the
    storage of those locals when suspending, which is fixed here.
    
    While the end of live range is implicit when executing return, it is
    nevertheless useful for inliner which would otherwise extend the live
    range beyond return.
    
    Fixes rust-lang#117733
    matthiaskrgr committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    b862e7e View commit details
    Browse the repository at this point in the history
  8. Rollup merge of rust-lang#118840 - matthiaskrgr:cloooooone, r=compile…

    …r-errors
    
    remove some redundant clones
    matthiaskrgr committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    fefa8fc View commit details
    Browse the repository at this point in the history
  9. Rollup merge of rust-lang#118844 - celinval:smir-mono-args, r=compile…

    …r-errors
    
    Monomorphize args while building Instance body in StableMIR
    
    The function `Instance::body()` in StableMIR is supposed to return a monomorphic body by instantiating all possibly generic constructs. We were previously instantiating type and constants, but not generic arguments. This PR ensures that we also instantiate them.
    
    r? ``@compiler-errors``
    matthiaskrgr committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    cdc4fc9 View commit details
    Browse the repository at this point in the history
  10. Rollup merge of rust-lang#118846 - celinval:smir-ty-methods, r=compil…

    …er-errors
    
    Fix BinOp `ty()` assertion and `fn_sig()` for closures
    
    `BinOp::ty()` was asserting that the argument types were primitives. However, the primitive check doesn't include pointers, which can be used in a `BinaryOperation`. Thus extend the arguments to include them.
    
    Since I had to add methods to check for pointers in TyKind, I just went ahead and added a bunch more utility checks that can be handy for our users and fixed the `fn_sig()` method to also include closures.
    
    `@compiler-errors` just wanted to confirm that today no `BinaryOperation` accept SIMD types. Is that correct?
    
    r? `@compiler-errors`
    matthiaskrgr committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    d67e80f View commit details
    Browse the repository at this point in the history
  11. Rollup merge of rust-lang#118848 - wesleywiser:vacation, r=wesleywiser

    Add myself back to review rotation
    matthiaskrgr committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    dae76b7 View commit details
    Browse the repository at this point in the history