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 6 pull requests #121636

Merged
merged 13 commits into from
Feb 26, 2024
Merged

Rollup of 6 pull requests #121636

merged 13 commits into from
Feb 26, 2024

Commits on Feb 21, 2024

  1. llvm-wrapper: fix warning C4244

    klensy committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    205cfcb View commit details
    Browse the repository at this point in the history
  2. llvm-wrapper: fix warning C4305

    llvm-wrapper/ArchiveWrapper.cpp(70): warning C4305: 'argument': truncation from 'int' to 'bool'
    while in llvm 12 signature was
     static ErrorOr<std::unique_ptr<MemoryBuffer>> getFile(const Twine &Filename, int64_t FileSize = -1, bool RequiresNullTerminator = true, bool IsVolatile = false);
    https://github.com/llvm/llvm-project/blame/fed41342a82f5a3a9201819a82bf7a48313e296b/llvm/include/llvm/Support/MemoryBuffer.h#L85-L87
    
    in llvm 13 and later it was changed to
    static ErrorOr<std::unique_ptr<MemoryBuffer>> getFile(const Twine &Filename, bool IsText = false, bool RequiresNullTerminator = true, bool IsVolatile = false);
    https://github.com/llvm/llvm-project/blame/75e33f71c2dae584b13a7d1186ae0a038ba98838/llvm/include/llvm/Support/MemoryBuffer.h#L86-L88
    
    so code was interpreted as MemoryBuffer::getFile(Path, /*IsText*/true, /*RequiresNullTerminator=*/false), but now will be MemoryBuffer::getFile(Path, /*IsText*/false, /*RequiresNullTerminator=*/false). How that worked before?
    klensy committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    0ce966f View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2024

  1. By changing some attributes to only_local, reducing encoding attribut…

    …es in the crate metadate.
    
    Thank you.
    This is part of changing attributes to only_local. I hope get your opinion  whether I should split into multiple PRs, or submit in one.
    
    According to [try to not rely on attributes from extern crates](rust-lang/compiler-team#505) and lcnr's guidance.
    surechen committed Feb 23, 2024
    Configuration menu
    Copy the full SHA
    ccf789b View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2024

  1. Move emit_stashed_diagnostic call in rustfmt.

    This call was added to `parse_crate_mod` in rust-lang#121487, to fix a case where
    a stashed diagnostic wasn't emitted. But there is another path where a
    stashed diagnostic might fail to be emitted if there's a parse error, if
    the `build` call in `parse_crate_inner` fails before `parse_crate_mod`
    is reached.
    
    So this commit moves the `emit_stashed_diagnostic` call outwards, from
    `parse_crate_mod` to `format_project`, just after the
    `Parser::parse_crate` call. This should be far out enough to catch any
    parsing errors.
    
    Fixes rust-lang#121517.
    nnethercote committed Feb 25, 2024
    Configuration menu
    Copy the full SHA
    bf7d1b5 View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2024

  1. Configuration menu
    Copy the full SHA
    ff07f55 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    297abc3 View commit details
    Browse the repository at this point in the history
  3. Do not const pop unions

    as they can made to produce values whose types don't
    match their underlying layout types which can lead to
    ICEs on eval
    gurry committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    633c92c View commit details
    Browse the repository at this point in the history
  4. Rollup merge of rust-lang#121389 - klensy:llvm-warn-fix, r=nikic

    llvm-wrapper: fix few warnings
    
    Two fixes: first one is simple unsigned -> uint64_t, but how second one is more subtile, see commit description.
    matthiaskrgr committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    6700714 View commit details
    Browse the repository at this point in the history
  5. Rollup merge of rust-lang#121493 - surechen:edit_attribute_only_local…

    …, r=lcnr
    
    By changing some attributes to only_local, reducing encoding attributes in the crate metadate.
    
    Thank you.
    This is part of changing attributes to only_local. I hope get your opinion  whether I should split into multiple PRs, or submit in one.
    
    According to [try to not rely on attributes from extern crates](rust-lang/compiler-team#505) and lcnr's guidance.
    matthiaskrgr committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    6e3ece3 View commit details
    Browse the repository at this point in the history
  6. Rollup merge of rust-lang#121615 - nnethercote:fix-121517, r=oli-obk

    Move `emit_stashed_diagnostic` call in rustfmt.
    
    This call was added to `parse_crate_mod` in rust-lang#121487, to fix a case where a stashed diagnostic wasn't emitted. But there is another path where a stashed diagnostic might fail to be emitted if there's a parse error, if the `build` call in `parse_crate_inner` fails before `parse_crate_mod` is reached.
    
    So this commit moves the `emit_stashed_diagnostic` call outwards, from `parse_crate_mod` to `format_project`, just after the `Parser::parse_crate` call. This should be far out enough to catch any parsing errors.
    
    Fixes rust-lang#121517.
    
    r? `@oli-obk`
    cc `@ytmimi`
    matthiaskrgr committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    9d5ab73 View commit details
    Browse the repository at this point in the history
  7. Rollup merge of rust-lang#121617 - compiler-errors:async-closure-kind…

    …-check, r=oli-obk
    
    Actually use the right closure kind when checking async Fn goals
    
    Dumb copy-paste mistake on my part from rust-lang#120712. Sorry!
    
    r? oli-obk
    
    Fixes rust-lang#121599
    matthiaskrgr committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    4f167b4 View commit details
    Browse the repository at this point in the history
  8. Rollup merge of rust-lang#121628 - gurry:121534-ice-asymm-binop, r=ol…

    …i-obk
    
    Do not const prop unions
    
    Unions can produce values whose types don't match their underlying layout types which can lead to ICEs on eval.
    
    Fixes rust-lang#121534
    matthiaskrgr committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    218be27 View commit details
    Browse the repository at this point in the history
  9. Rollup merge of rust-lang#121629 - RalfJung:field-shuffle-seed, r=oli…

    …-obk
    
    fix some references to no-longer-existing ReprOptions.layout_seed
    
    Seems like the field got renamed but some comments not updated.
    matthiaskrgr committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    81eddb3 View commit details
    Browse the repository at this point in the history