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 9 pull requests #109230

Closed
wants to merge 34 commits into from

Commits on Mar 12, 2023

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

Commits on Mar 14, 2023

  1. Configuration menu
    Copy the full SHA
    9afffc5 View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2023

  1. Configuration menu
    Copy the full SHA
    fb916a0 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    86a5e36 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    26c4c1e View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    39ffe96 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    39d19ca View commit details
    Browse the repository at this point in the history
  6. Handle proc-macro spans pointing at attribute in suggestions

    Hide invalid proc-macro suggestions and track spans
    coming from proc-macros pointing at attribute.
    
    Effectively, unless the proc-macro keeps user spans,
    suggestions will not be produced for the code they
    produce.
    
    Account for desugaring when checking if a span can be used for suggestions
    
    Fix rust-lang#106720.
    estebank committed Mar 15, 2023
    Configuration menu
    Copy the full SHA
    d9ac2be View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    00a2616 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    f219ab5 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    d692d37 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    b54ba21 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    8a47602 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    d7c0bcd View commit details
    Browse the repository at this point in the history
  13. Fix rust-lang#90557

    estebank committed Mar 15, 2023
    Configuration menu
    Copy the full SHA
    0172d15 View commit details
    Browse the repository at this point in the history
  14. Small cleanup

    estebank committed Mar 15, 2023
    Configuration menu
    Copy the full SHA
    019556d View commit details
    Browse the repository at this point in the history
  15. inherit_overflow: adapt pattern to also work with v0 mangling

    This test was failing under new-symbol-mangling = true. Adapt pattern to
    work in both cases.
    
    Related to rust-lang#106002 from December.
    durin42 committed Mar 15, 2023
    Configuration menu
    Copy the full SHA
    0b9b7dd View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    e41491f View commit details
    Browse the repository at this point in the history
  17. Configuration menu
    Copy the full SHA
    11f1810 View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    c5c4340 View commit details
    Browse the repository at this point in the history
  19. Configuration menu
    Copy the full SHA
    738ea1b View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2023

  1. Configuration menu
    Copy the full SHA
    0949da8 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    ff7c3b8 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    8d922eb View commit details
    Browse the repository at this point in the history
  4. Use sort_by_key instead of sort_by

    I went over the cases where sort_by is used and in these two,
    one can use sort_by_key instead.
    est31 committed Mar 16, 2023
    Configuration menu
    Copy the full SHA
    a8839c3 View commit details
    Browse the repository at this point in the history
  5. Rollup merge of rust-lang#108958 - clubby789:unbox-the-hir, r=compile…

    …r-errors
    
    Remove box expressions from HIR
    
    After rust-lang#108516, `#[rustc_box]` is used at HIR->THIR lowering and this is no longer emitted, so it can be removed.
    
    This is based on top of rust-lang#108471 to help with conflicts, so 43490488ccacd1a822e9c621f5ed6fca99959a0b is the only relevant commit (sorry for all the duplicated pings!)
    
    `@rustbot` label +S-blocked
    matthiaskrgr committed Mar 16, 2023
    Configuration menu
    Copy the full SHA
    11a80a0 View commit details
    Browse the repository at this point in the history
  6. Rollup merge of rust-lang#108997 - tgross35:patch-1, r=JohnTitor

    Change text -> rust highlighting in sanitizer.md
    
    Not sure why this has syntax highlighting turned off, but it doesn't need to be
    
    Relevant page: https://doc.rust-lang.org/beta/unstable-book/compiler-flags/sanitizer.html
    matthiaskrgr committed Mar 16, 2023
    Configuration menu
    Copy the full SHA
    e505cdc View commit details
    Browse the repository at this point in the history
  7. Rollup merge of rust-lang#109044 - thomcc:disallow-unstable-libtest, …

    …r=jyn514
    
    Prevent stable `libtest` from supporting `-Zunstable-options`
    
    Took a while for me to get around to this but seems trivial (unless I'm missing some reason this will break all our tests). Fixes rust-lang#75526
    
    Basically `libtest` already tries to handle this in https://github.com/rust-lang/rust/blob/501ad021b9a4fb2cd6a39e0302d22f169f6166b0/library/test/src/cli.rs#L310-L318
    
    But that env var was not passed. I'm guessing at one point [this code](https://github.com/rust-lang/rust/blob/501ad021b9a4fb2cd6a39e0302d22f169f6166b0/src/bootstrap/compile.rs#L842-L844) (or a common ancestor) was used to compile the standard library/libtest, but that is no longer the case (or perhaps it never worked, I don't have time to go digging).
    
    I don't love that this is a "allow unstable by default" situation, as it means things like [`rustc-build-sysroot`](https://github.com/RalfJung/rustc-build-sysroot) could accidentally get unstable (CC `@RalfJung)` even if this is fixed here, but it's consistent with what happens in `rustc_feature`, so... yeah.
    
    This is user-facing after all, even if it's hard to imagine the outcome of that conversation being "lets continue allowing use of `-Zunstable-features` from stable rust" (especially since a `RUSTC_BOOTSTRAP=1`-shaped loophole remains)... I think it probably should get a vibe check in the t-libs meeting (and plausibly a relnote along the lines of "hey `cargo test -- -Zunstable-options --some --unstable --stuff=here` used to work on stable, that's been fixed, sorry").
    
    I'll nominate it for that after CI comes up green (I've done a smoke check but don't know what (if anything) will need `bootstrap` to enable `RUSTC_BOOTSTRAP=1` when running tests)
    
    r? `@jyn514`
    matthiaskrgr committed Mar 16, 2023
    Configuration menu
    Copy the full SHA
    3182334 View commit details
    Browse the repository at this point in the history
  8. Rollup merge of rust-lang#109082 - estebank:macro-spans, r=oli-obk

    Do not provide suggestions when the spans come from expanded code that doesn't point at user code
    
    Hide invalid proc-macro suggestions and track spans
    coming from proc-macros pointing at attribute.
    
    Effectively, unless the proc-macro keeps user spans,
    suggestions will not be produced for the code they
    produce.
    
    r? `@ghost`
    
    Fix rust-lang#107113, fix rust-lang#107976, fix rust-lang#107977, fix rust-lang#108748, fix rust-lang#106720, fix rust-lang#90557.
    
    Could potentially address rust-lang#50141, rust-lang#67373, rust-lang#55146, rust-lang#78862, rust-lang#74043, rust-lang#88514, rust-lang#83320, rust-lang#91520, rust-lang#104071. CC rust-lang#50122, rust-lang#76360.
    matthiaskrgr committed Mar 16, 2023
    Configuration menu
    Copy the full SHA
    1d17b6a View commit details
    Browse the repository at this point in the history
  9. Rollup merge of rust-lang#109155 - taiki-e:riscv64-fuchsia-fix-llvm-t…

    …arget, r=tmandry
    
    Fix riscv64 fuchsia LLVM target name
    
    Currently, riscv64gc-unknown-fuchsia (added in rust-lang#108722) sets riscv64*gc*-unknown-fuchsia as the LLVM target.
    
    https://github.com/rust-lang/rust/blob/1716932743a7b3705cbf0c34db0c4e070ed1930d/compiler/rustc_target/src/spec/riscv64gc_unknown_fuchsia.rs#L5
    
    However, riscv64*gc*-\* is not a valid LLVM target and causes the following error.
    
    ```console
    $ rustc --print cfg --target riscv64gc-unknown-fuchsia
    error: could not create LLVM TargetMachine for triple: riscv64gc-unknown-fuchsia: No available targets are compatible with triple "riscv64gc-unknown-fuchsia"
    ```
    
    As with other RISC-V targets, the LLVM target should use riscv64-\*, not riscv64*gc*-\*.
    
    https://github.com/rust-lang/rust/blob/1716932743a7b3705cbf0c34db0c4e070ed1930d/compiler/rustc_target/src/spec/riscv64gc_unknown_freebsd.rs#L5
    https://github.com/rust-lang/rust/blob/1716932743a7b3705cbf0c34db0c4e070ed1930d/compiler/rustc_target/src/spec/riscv64gc_unknown_linux_gnu.rs#L5
    
    I confirmed that riscv64-unknown-fuchsia is recognized as a valid LLVM target by using custom targets.
    
    ```console
    # create a custom target with `"llvm-target": "riscv64-unknown-fuchsia" from no-std riscv64gc target.
    $ rustc --print target-spec-json -Z unstable-options --target riscv64gc-unknown-none-elf | grep -v is-builtin | sed 's/"llvm-target".*/"llvm-target": "riscv64-unknown-fuchsia",/' > riscv64gc-unknown-fuchsia.json
    
    $ rustc --print cfg --target riscv64gc-unknown-fuchsia.json
    debug_assertions
    panic="abort"
    target_abi=""
    target_arch="riscv64"
    target_endian="little"
    target_env=""
    target_feature="a"
    target_feature="c"
    target_feature="d"
    target_feature="f"
    target_feature="m"
    ...
    
    $ cat riscv64gc-unknown-fuchsia.json
    {
      "arch": "riscv64",
      "code-model": "medium",
      "cpu": "generic-rv64",
      "data-layout": "e-m:e-p:64:64-i64:64-i128:128-n32:64-S128",
      "eh-frame-header": false,
      "emit-debug-gdb-scripts": false,
      "features": "+m,+a,+f,+d,+c",
      "linker": "rust-lld",
      "linker-flavor": "ld.lld",
      "llvm-abiname": "lp64d",
      "llvm-target": "riscv64-unknown-fuchsia",
      "max-atomic-width": 64,
      "panic-strategy": "abort",
      "relocation-model": "static",
      "supported-sanitizers": [
        "kernel-address"
      ],
      "target-pointer-width": "64"
    }
    
    # Check the current master's LLVM target name causes an error
    $ sed -i 's/riscv64-unknown-fuchsia/riscv64gc-unknown-fuchsia/' riscv64gc-unknown-fuchsia.json
    $ rustc --print cfg --target riscv64gc-unknown-fuchsia.json
    error: could not create LLVM TargetMachine for triple: riscv64gc-unknown-fuchsia: No available targets are compatible with triple "riscv64gc-unknown-fuchsia"
    ```
    
    r? `@tmandry`
    matthiaskrgr committed Mar 16, 2023
    Configuration menu
    Copy the full SHA
    0148cc4 View commit details
    Browse the repository at this point in the history
  10. Rollup merge of rust-lang#109156 - taiki-e:linker-detection, r=petroc…

    …henkov
    
    Fix linker detection for clang with prefix
    
    rust-lang#106489 removed check for clang with prefix. It says:
    
    > Also remove the check for -clang, since there are no architecture specific variants of clang (to my knowledge).
    
    However, when doing cross-compilation, a wrapper script for clang with the target name as a prefix is sometimes used.
    
    https://github.com/rust-lang/rust/blob/1716932743a7b3705cbf0c34db0c4e070ed1930d/src/ci/docker/host-x86_64/dist-various-2/Dockerfile#L62
    
    https://github.com/rust-lang/rust/blob/1716932743a7b3705cbf0c34db0c4e070ed1930d/src/ci/docker/scripts/freebsd-toolchain.sh#L76-L80
    
    https://github.com/rust-lang/rust/blob/1716932743a7b3705cbf0c34db0c4e070ed1930d/src/ci/docker/host-x86_64/dist-various-2/Dockerfile#L40
    
    https://github.com/rust-lang/rust/blob/1716932743a7b3705cbf0c34db0c4e070ed1930d/compiler/rustc_target/src/spec/aarch64_pc_windows_gnullvm.rs#L7
    
    It seems the regression did not occur on the targets mentioned above because the default linker flavor is gcc, but it did occur on targets where the default linker flavor is not gcc (taiki-e/setup-cross-toolchain-action@fd352f3).
    
    r? `@petrochenkov`
    matthiaskrgr committed Mar 16, 2023
    Configuration menu
    Copy the full SHA
    4612076 View commit details
    Browse the repository at this point in the history
  11. Rollup merge of rust-lang#109181 - durin42:v0-mangle-inherit_overflow…

    …, r=Nilstrieb
    
    inherit_overflow: adapt pattern to also work with v0 mangling
    
    This test was failing under new-symbol-mangling = true. Adapt pattern to work in both cases.
    
    Related to rust-lang#106002 from December.
    matthiaskrgr committed Mar 16, 2023
    Configuration menu
    Copy the full SHA
    4f4a3f0 View commit details
    Browse the repository at this point in the history
  12. Rollup merge of rust-lang#109198 - compiler-errors:new-rpitit-default…

    …-body, r=spastorino
    
    Install projection from RPITIT to default trait method opaque correctly
    
    1. For new lowering strategy `-Zlower-impl-trait-in-trait-to-assoc-ty`, install the correct default trait method projection predicates (RPITIT -> opaque). This makes default trait body tests pass!
    
    2. Fix two WF-checking bugs -- first, we want to make sure that we're always looking for an opaque type in `check_return_position_impl_trait_in_trait_bounds`. That's because the RPITIT projections are normalized to opaques during wfcheck. Second, fix RPITIT's param-envs by not adding the projection predicates that we install on trait methods to make default RPITITs work -- I left a comment why.
    
    3. Also, just a small drive-by for `rustc_on_unimplemented`. Not sure if it affects any tests, but can't hurt.
    
    r? `@spastorino,` based off of rust-lang#109140
    matthiaskrgr committed Mar 16, 2023
    Configuration menu
    Copy the full SHA
    e9f4cae View commit details
    Browse the repository at this point in the history
  13. Rollup merge of rust-lang#109215 - est31:sort_by_key, r=Nilstrieb

    Use sort_by_key instead of sort_by
    
    I went over the cases where sort_by is used and in these two, one can use sort_by_key instead.
    matthiaskrgr committed Mar 16, 2023
    Configuration menu
    Copy the full SHA
    686e832 View commit details
    Browse the repository at this point in the history