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 5 pull requests #113608

Merged
merged 17 commits into from
Jul 12, 2023
Merged

Rollup of 5 pull requests #113608

merged 17 commits into from
Jul 12, 2023

Commits on Jul 5, 2023

  1. Make --dry-run more useful when download-rustc is enabled

    Previously, it would always treat download-rustc as set to false, which made bootstrap issues with
    download-rustc hard to debug.
    jyn514 committed Jul 5, 2023
    Configuration menu
    Copy the full SHA
    e153d82 View commit details
    Browse the repository at this point in the history
  2. check ci-rustc options

    jyn514 committed Jul 5, 2023
    Configuration menu
    Copy the full SHA
    32057b7 View commit details
    Browse the repository at this point in the history
  3. fix x test --stage 0 core

    jyn514 committed Jul 5, 2023
    Configuration menu
    Copy the full SHA
    1f0487f View commit details
    Browse the repository at this point in the history
  4. don't try to cross-compile sanitizer tests

    this was a pre-existing latent bug, we just didn't have any CI builders exercising it.
    
    fixes the following errors:
    ```
     ---- [ui] tests/ui/sanitize/new-llvm-pass-manager-thin-lto.rs#opt1 stdout ----
    
    error in revision `opt1`: test compilation failed although it shouldn't!
    status: exit status: 1
    command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/tests/ui/sanitize/new-llvm-pass-manager-thin-lto.rs" "-Zthreads=1" "-Zsimulate-remapped-rust-src-base=/rustc/FAKE_PREFIX" "-Ztranslate-remapped-path-to-local-path=no" "--sysroot" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2" "--target=i686-unknown-linux-gnu" "--cfg" "opt1" "--error-format" "json" "--json" "future-incompat" "-Ccodegen-units=1" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "-Cstrip=debuginfo" "--remap-path-prefix=/checkout/tests/ui=fake-test-src-base" "-o" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/sanitize/new-llvm-pass-manager-thin-lto.opt1/a" "-A" "unused" "-Crpath" "-Cdebuginfo=0" "-Lnative=/checkout/obj/build/i686-unknown-linux-gnu/native/rust-test-helpers" "-Clinker=x86_64-linux-gnu-gcc" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/sanitize/new-llvm-pass-manager-thin-lto.opt1/auxiliary" "-Zsanitizer=address" "-Clto=thin" "-Copt-level=1"
    --- stderr -------------------------------
    error: linking with `x86_64-linux-gnu-gcc` failed: exit status: 1
       = note: x86_64-linux-gnu-gcc: error: /checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/i686-unknown-linux-gnu/lib/librustc-nightly_rt.asan.a: No such file or directory
    
    failures:
        [ui] tests/ui/sanitize/badfree.rs
        [ui] tests/ui/sanitize/address.rs
        [ui] tests/ui/sanitize/use-after-scope.rs
        [ui] tests/ui/sanitize/new-llvm-pass-manager-thin-lto.rs#opt0
        [ui] tests/ui/sanitize/new-llvm-pass-manager-thin-lto.rs#opt1
    ```
    jyn514 committed Jul 5, 2023
    Configuration menu
    Copy the full SHA
    f7287b9 View commit details
    Browse the repository at this point in the history
  5. allow mixing llvm.assertions and download-rustc

    by using `rustc-builds-alt` if download-rustc is set
    
    this also changes the download code to use a separate build/cache/ directory and .rustc-stamp stamp file depending on whether assertions are enabled.
    jyn514 committed Jul 5, 2023
    Configuration menu
    Copy the full SHA
    baae59e View commit details
    Browse the repository at this point in the history
  6. style-guide: Fix chain example to match rustfmt behavior

    The style guide gave an example of breaking a multi-line chain element
    and all subsequent elements to a new line, but that same example and the
    accompanying text also had several chain items stacked on the first
    line. rustfmt doesn't do this, except when the rule saying to combine
    
    ```
    shrt
        .y()
    ```
    
    into
    
    ```
    shrt.y()
    ```
    
    applies.
    joshtriplett committed Jul 5, 2023
    Configuration menu
    Copy the full SHA
    24534cf View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2023

  1. Configuration menu
    Copy the full SHA
    9aed969 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    05bc71c View commit details
    Browse the repository at this point in the history
  3. Use constants from object crate

    Replace hard-coded values with  GNU_PROPERTY_{X86|AARCH64}_FEATURE_1_AND from the object crate.
    Charisee committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    6502439 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2023

  1. Configuration menu
    Copy the full SHA
    934e7e6 View commit details
    Browse the repository at this point in the history
  2. Don't depend on crate names in tests/ui-fulldeps/missing-rustc-driver…

    …-error.rs
    
    Not only are they a pain to update, but they differ depending on whether `parallel-rustc` is enabled or not
    jyn514 committed Jul 12, 2023
    Configuration menu
    Copy the full SHA
    30e34f3 View commit details
    Browse the repository at this point in the history
  3. Revert "Fix x test lint-docs when download-rustc is enabled"

    This was not the correct fix. The problem was two-fold:
    - `download-rustc` didn't respect `llvm.assertions`
    - `rust-dev` was missing a bump to `download-ci-llvm-stamp`
    
    The first is fixed in this PR and the latter was fixed a while ago. Revert this change to avoid breaking `rpath = false`.
    jyn514 committed Jul 12, 2023
    Configuration menu
    Copy the full SHA
    67b5990 View commit details
    Browse the repository at this point in the history
  4. Rollup merge of rust-lang#113373 - jyn514:download-rustc-fixes, r=alb…

    …ertlarsan68
    
    various download-rustc fixes
    
    separated out from rust-lang#112143 because it keeps getting stuck in limbo.
    
    best reviewed commit-by-commit
    workingjubilee authored Jul 12, 2023
    Configuration menu
    Copy the full SHA
    dff0725 View commit details
    Browse the repository at this point in the history
  5. Rollup merge of rust-lang#113385 - joshtriplett:style-guide-cleanup-c…

    …hains, r=calebcartwright
    
    style-guide: Fix chain example to match rustfmt behavior
    
    The style guide gave an example of breaking a multi-line chain element
    and all subsequent elements to a new line, but that same example and the
    accompanying text also had several chain items stacked on the first
    line. rustfmt doesn't do this, except when the rule saying to combine
    
    ```
    shrt
        .y()
    ```
    
    into
    
    ```
    shrt.y()
    ```
    
    applies.
    
    This is a bugfix to match rustfmt behavior, so it's not a breaking change, and
    it just needs a ``@rust-lang/style`` reviewer to r+.
    workingjubilee authored Jul 12, 2023
    Configuration menu
    Copy the full SHA
    3518041 View commit details
    Browse the repository at this point in the history
  6. Rollup merge of rust-lang#113567 - chenyukang:yukang-fix-113354-while…

    …-let, r=cjgillot
    
    While let suggestion will work for closure body
    
    Fixes rust-lang#113354
    workingjubilee authored Jul 12, 2023
    Configuration menu
    Copy the full SHA
    f7a34f9 View commit details
    Browse the repository at this point in the history
  7. Rollup merge of rust-lang#113579 - ekusiadadus:master, r=albertlarsan68

    Revert "fix: 🐛 etc/bash_complettion -> src/etc/... to avoid copy …
    
    ## why
    
    - [x] revert my broken PR
    
    rust-lang#110906
    
    This reverts commit 08ce68b.
    workingjubilee authored Jul 12, 2023
    Configuration menu
    Copy the full SHA
    dc78ced View commit details
    Browse the repository at this point in the history
  8. Rollup merge of rust-lang#113595 - cchiw:object_consts, r=workingjubilee

    Use constants from object crate
    
    Replace hard-coded values with  `GNU_PROPERTY_{X86|AARCH64}_FEATURE_1_AND` from the object crate.
    
    When working on  [issue](rust-lang#103001) it was suggested that we moved these constants to the object crate .  [PR](gimli-rs/object#537). Now that that the object crate has been updated  [PR](rust-lang#111413) we can make this change.
    workingjubilee authored Jul 12, 2023
    Configuration menu
    Copy the full SHA
    f05e6e6 View commit details
    Browse the repository at this point in the history