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 #112270

Merged
merged 15 commits into from
Jun 4, 2023
Merged

Rollup of 6 pull requests #112270

merged 15 commits into from
Jun 4, 2023

Commits on Mar 13, 2023

  1. add #[doc(alias="flatmap")] to Option::and_then

    I keep forgetting that rust calls this `and_then` and trying to search for `flatmap`.
    `and_then`'s docs even mention "Some languages call this operation flatmap",
    but it doesn't show up as a result in the search at `https://doc.rust-lang.org/std/?search=flatmap`
    Dante-Broggi authored Mar 13, 2023
    Configuration menu
    Copy the full SHA
    7fb34c9 View commit details
    Browse the repository at this point in the history

Commits on May 26, 2023

  1. Revert "Enable incremental independent of stage"

    This reverts commit 827f656.
    
    Incremental is not sound to use across stages. Arbitrary changes to the compiler can invalidate the
    incremental cache - even changes to normal queries, not incremental itself! - and we do not
    currently enable `incremental-verify-ich` in bootstrap. Since 2018, we highly recommend and nudge
    users towards stage 1 builds instead of stage 2, and using `keep-stage` for anything other than
    libstd is very rare.
    
    I don't think the risk of unsoundness is worth the very minor speedup when building libstd. Disable
    incremental to avoid spurious panics and miscompilations when building with the stage 1 and 2
    sysroot.
    jyn514 committed May 26, 2023
    Configuration menu
    Copy the full SHA
    b42ff20 View commit details
    Browse the repository at this point in the history

Commits on May 31, 2023

  1. Make x test --dry-run less verbose

    Previously, this would print a message for each doctest, which was quite
    verbose:
    ```
    doc tests for: /home/jyn/src/rust/src/doc/rustc/src/exploit-mitigations.md
    doc tests for: /home/jyn/src/rust/src/doc/rustc/src/instrument-coverage.md
    doc tests for: /home/jyn/src/rust/src/doc/rustc/src/json.md
    doc tests for: /home/jyn/src/rust/src/doc/rustc/src/linker-plugin-lto.md
    doc tests for: /home/jyn/src/rust/src/doc/rustc/src/lints/groups.md
    doc tests for: /home/jyn/src/rust/src/doc/rustc/src/lints/index.md
    doc tests for: /home/jyn/src/rust/src/doc/rustc/src/lints/levels.md
    doc tests for: /home/jyn/src/rust/src/doc/rustc/src/platform-support/aarch64-apple-ios-sim.md
    doc tests for: /home/jyn/src/rust/src/doc/rustc/src/platform-support/aarch64-nintendo-switch-freestanding.md
    doc tests for: /home/jyn/src/rust/src/doc/rustc/src/platform-support/apple-watchos.md
    doc tests for: /home/jyn/src/rust/src/doc/rustc/src/platform-support/armeb-unknown-linux-gnueabi.md
    doc tests for: /home/jyn/src/rust/src/doc/rustc/src/platform-support/armv4t-none-eabi.md
    doc tests for: /home/jyn/src/rust/src/doc/rustc/src/platform-support/armv5te-none-eabi.md
    doc tests for: /home/jyn/src/rust/src/doc/rustc/src/platform-support/armv6k-nintendo-3ds.md
    doc tests for: /home/jyn/src/rust/src/doc/rustc/src/platform-support/armv7-sony-vita-newlibeabihf.md
    doc tests for: /home/jyn/src/rust/src/doc/rustc/src/platform-support/armv7-unknown-linux-uclibceabi.md
    doc tests for: /home/jyn/src/rust/src/doc/rustc/src/platform-support/armv7-unknown-linux-uclibceabihf.md
    doc tests for: /home/jyn/src/rust/src/doc/rustc/src/platform-support/esp-idf.md
    doc tests for: /home/jyn/src/rust/src/doc/rustc/src/platform-support/fuchsia.md
    doc tests for: /home/jyn/src/rust/src/doc/rustc/src/platform-support/kmc-solid.md
    doc tests for: /home/jyn/src/rust/src/doc/rustc/src/platform-support/loongarch-linux.md
    doc tests for: /home/jyn/src/rust/src/doc/rustc/src/platform-support/m68k-unknown-linux-gnu.md
    doc tests for: /home/jyn/src/rust/src/doc/rustc/src/platform-support/mipsel-sony-psx.md
    doc tests for: /home/jyn/src/rust/src/doc/rustc/src/platform-support/nto-qnx.md
    doc tests for: /home/jyn/src/rust/src/doc/rustc/src/platform-support/openbsd.md
    doc tests for: /home/jyn/src/rust/src/doc/rustc/src/platform-support/openharmony.md
    doc tests for: /home/jyn/src/rust/src/doc/rustc/src/platform-support/riscv32imac-unknown-xous-elf.md
    doc tests for: /home/jyn/src/rust/src/doc/rustc/src/platform-support/unknown-uefi.md
    doc tests for: /home/jyn/src/rust/src/doc/rustc/src/platform-support/wasm64-unknown-unknown.md
    doc tests for: /home/jyn/src/rust/src/doc/rustc/src/platform-support/x86_64-fortanix-unknown-sgx.md
    doc tests for: /home/jyn/src/rust/src/doc/rustc/src/platform-support/x86_64-unknown-none.md
    doc tests for: /home/jyn/src/rust/src/doc/rustc/src/profile-guided-optimization.md
    doc tests for: /home/jyn/src/rust/src/doc/rustc/src/target-tier-policy.md
    doc tests for: /home/jyn/src/rust/src/doc/rustc/src/targets/custom.md
    doc tests for: /home/jyn/src/rust/src/doc/rustc/src/targets/index.md
    doc tests for: /home/jyn/src/rust/src/doc/rustc/src/tests/index.md
    doc tests for: /home/jyn/src/rust/src/doc/rustc/src/what-is-rustc.md
    ```
    jyn514 committed May 31, 2023
    Configuration menu
    Copy the full SHA
    2f0a266 View commit details
    Browse the repository at this point in the history
  2. Fix x test --stage 2 core when download-rustc is enabled

    This works by building std from source unconditionally instead of downloading it, for library tests only.
    
    This was somewhat complicated because of the following requirements:
    1. Unconditionally downloading libstd breaks `x test std`, because `coretests` requires the std loaded from the sysroot to match the std that's currently being tested.
    2. Unconditionally rebuilding libstd breaks `x test ui-fulldeps librustdoc`, because anything loading `rustc_private` needs to use the same libstd that rustc was built with.
    
    Break the knot by introducing a new `stage2-test-sysroot`, used only for testing `std` itself. This
    holds a freshly compiled std, while `stage2` and `ci-rustc-sysroot` still hold the downloaded std.
    
    This also extends the existing `cp_filtered` in Sysroot to apply to the `rust-std` component, not just the `rustc-dev` component.
    jyn514 committed May 31, 2023
    Configuration menu
    Copy the full SHA
    a80d69a View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2023

  1. Configuration menu
    Copy the full SHA
    8abb803 View commit details
    Browse the repository at this point in the history
  2. doc: improve explanation

    tshepang authored Jun 1, 2023
    Configuration menu
    Copy the full SHA
    793fa8d View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    96892a5 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    a825b1e View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2023

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

Commits on Jun 4, 2023

  1. Rollup merge of rust-lang#109093 - Dante-Broggi:patch-2, r=joshtriplett

    add `#[doc(alias="flatmap")]` to `Option::and_then`
    
    I keep forgetting that rust calls this `and_then` and trying to search for `flatmap`. `and_then`'s docs even mention "Some languages call this operation flatmap", but it doesn't show up as a result in the search at `https://doc.rust-lang.org/std/?search=flatmap`
    matthiaskrgr authored Jun 4, 2023
    Configuration menu
    Copy the full SHA
    7ee2505 View commit details
    Browse the repository at this point in the history
  2. Rollup merge of rust-lang#110701 - jyn514:test-core, r=Mark-Simulacrum

    Fix `x test core` when download-rustc is enabled
    
    Fix `x test --stage 2 core` when download-rustc is enabled
    
    This works by building std from source instead of downloading it, for library tests only.
    
    This was somewhat complicated because of the following requirements:
    1. Unconditionally downloading libstd breaks `x test core`, because `coretests` requires the std loaded from the sysroot to match the std that's currently being tested.
    2. Unconditionally rebuilding libstd breaks `x test ui-fulldeps librustdoc`, because anything loading `rustc_private` needs to use the same libstd that rustc was built with.
    
    Break the knot by introducing a new `stage2-test-sysroot`, used only for testing `std` itself. This
    holds a freshly compiled std, while `stage2` and `ci-rustc-sysroot` still hold the downloaded std.
    
    This also extends the existing `cp_filtered` in Sysroot to apply to the `rust-std` component, not just the `rustc-dev` component, to avoid having both versions of std in `stage2-test-sysroot`.
    
    Fixes rust-lang#110352.
    matthiaskrgr authored Jun 4, 2023
    Configuration menu
    Copy the full SHA
    f2f0e6c View commit details
    Browse the repository at this point in the history
  3. Rollup merge of rust-lang#111982 - jyn514:disable-incremental, r=Mark…

    …-Simulacrum
    
    Revert "Enable incremental independent of stage"
    
    This reverts commit 827f656.
    
    Incremental is not sound to use across stages. Arbitrary changes to the compiler can invalidate the incremental cache - even changes to normal queries, not incremental itself! - and we do not currently enable `incremental-verify-ich` in bootstrap. Since 2018, we highly recommend and nudge users towards stage 1 builds instead of stage 2, and using `keep-stage` for anything other than libstd is very rare.
    
    I don't think the risk of unsoundness is worth the very minor speedup when building libstd. Disable incremental to avoid spurious panics and miscompilations when building with the stage 1 and 2 sysroot.
    
    Combined with rust-lang#111329, this should fix rust-lang#76720.
    
    r? `@Mark-Simulacrum`
    matthiaskrgr authored Jun 4, 2023
    Configuration menu
    Copy the full SHA
    d545220 View commit details
    Browse the repository at this point in the history
  4. Rollup merge of rust-lang#112158 - calebzulawski:cc, r=Mark-Simulacrum

    Add portable-simd mention
    
    Adds a triagebot message for portable-simd
    matthiaskrgr authored Jun 4, 2023
    Configuration menu
    Copy the full SHA
    629a1e4 View commit details
    Browse the repository at this point in the history
  5. Rollup merge of rust-lang#112172 - tshepang:patch-1, r=Mark-Simulacrum

    doc: improve explanation
    matthiaskrgr authored Jun 4, 2023
    Configuration menu
    Copy the full SHA
    cbc3e3f View commit details
    Browse the repository at this point in the history
  6. Rollup merge of rust-lang#112178 - GuillaumeGomez:fix-inline-private-…

    …intermediate, r=notriddle
    
    Fix bug where private item with intermediate doc hidden re-export was not inlined
    
    This fixes this bug:
    
    ```rust
    mod private {
        /// Original.
        pub struct Bar3;
    }
    
    /// Hidden.
    #[doc(hidden)]
    pub use crate::private::Bar3;
    /// Visible.
    pub use self::Bar3 as Reexport;
    ```
    
    In this case, `private::Bar3` should be inlined and renamed `Reexport` but instead we have:
    
    ```
    pub use self::Bar3 as Reexport;
    ```
    
    and no links.
    
    There were actually two issues: the first one is that we forgot to check if the next intermediate re-export was doc hidden. The second was that we made the `#[doc(hidden)]` attribute inheritable, which shouldn't be possible.
    
    r? `@notriddle`
    matthiaskrgr authored Jun 4, 2023
    Configuration menu
    Copy the full SHA
    0d6749c View commit details
    Browse the repository at this point in the history