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

Closed
wants to merge 17 commits into from
Closed

Commits on Aug 23, 2024

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

Commits on Sep 13, 2024

  1. Configuration menu
    Copy the full SHA
    561a6c5 View commit details
    Browse the repository at this point in the history
  2. Rustfmt

    c410-f3r committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    ae15032 View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2024

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

Commits on Sep 26, 2024

  1. Configuration menu
    Copy the full SHA
    36455c6 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    20c0067 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    42542d8 View commit details
    Browse the repository at this point in the history
  4. cargo update: rustbook

    rustbook dependencies:
         Locking 70 packages to latest compatible versions
        Removing adler v1.0.2
          Adding adler2 v2.0.0
        Updating anstream v0.6.14 -> v0.6.15
        Updating anstyle v1.0.7 -> v1.0.8
        Updating anstyle-parse v0.2.4 -> v0.2.5
        Updating anstyle-query v1.1.0 -> v1.1.1
        Updating anstyle-wincon v3.0.3 -> v3.0.4
        Updating anyhow v1.0.86 -> v1.0.89
        Removing base64 v0.22.1
        Updating bstr v1.9.1 -> v1.10.0
          Adding byteorder v1.5.0
        Updating cc v1.1.5 -> v1.1.21
        Updating clap v4.5.9 -> v4.5.18
        Updating clap_builder v4.5.9 -> v4.5.18
        Updating clap_complete v4.5.8 -> v4.5.29
        Updating clap_derive v4.5.8 -> v4.5.18
        Updating clap_lex v0.7.1 -> v0.7.2
        Updating colorchoice v1.0.1 -> v1.0.2
        Updating core-foundation-sys v0.8.6 -> v0.8.7
        Updating cpufeatures v0.2.12 -> v0.2.14
          Adding dateparser v0.2.1
        Removing deranged v0.3.11
        Updating env_filter v0.1.0 -> v0.1.2
        Updating env_logger v0.11.3 -> v0.11.5
        Updating fastrand v2.1.0 -> v2.1.1
        Updating flate2 v1.0.30 -> v1.0.33
        Updating iana-time-zone v0.1.60 -> v0.1.61
        Updating indexmap v2.2.6 -> v2.5.0
        Updating is_terminal_polyfill v1.70.0 -> v1.70.1
        Updating js-sys v0.3.69 -> v0.3.70
          Adding lazy_static v1.5.0
        Updating libc v0.2.155 -> v0.2.158
        Removing linked-hash-map v0.5.6
        Updating mdbook-i18n-helpers v0.3.4 -> v0.3.5
        Updating miniz_oxide v0.7.4 -> v0.8.0
        Updating normpath v1.2.0 -> v1.3.0
        Removing num-conv v0.1.0
        Updating opener v0.7.1 -> v0.7.2
        Updating pest v2.7.11 -> v2.7.13
        Updating pest_derive v2.7.11 -> v2.7.13
        Updating pest_generator v2.7.11 -> v2.7.13
        Updating pest_meta v2.7.11 -> v2.7.13
        Removing plist v1.7.0
        Removing powerfmt v0.2.0
        Updating ppv-lite86 v0.2.17 -> v0.2.20
          Adding pulldown-cmark v0.11.3 (latest: v0.12.1)
          Adding pulldown-cmark-escape v0.11.0
          Adding pulldown-cmark-to-cmark v15.0.1 (latest: v17.0.0)
        Removing quick-xml v0.32.0
        Updating quote v1.0.36 -> v1.0.37
        Updating redox_syscall v0.5.3 -> v0.5.4
        Updating regex v1.10.5 -> v1.10.6
        Updating rustix v0.38.34 -> v0.38.37
        Updating serde v1.0.204 -> v1.0.210
        Updating serde_derive v1.0.204 -> v1.0.210
        Updating serde_json v1.0.120 -> v1.0.128
        Updating serde_spanned v0.6.6 -> v0.6.7
        Updating syn v2.0.71 -> v2.0.77
        Updating tempfile v3.10.1 -> v3.12.0
        Updating thiserror v1.0.62 -> v1.0.63
        Updating thiserror-impl v1.0.62 -> v1.0.63
        Removing time v0.3.36
        Removing time-core v0.1.2
        Removing time-macros v0.2.18
        Updating toml v0.8.14 -> v0.8.19
        Updating toml_datetime v0.6.6 -> v0.6.8
        Updating toml_edit v0.22.15 -> v0.22.21
        Updating unicode-ident v1.0.12 -> v1.0.13
        Updating unicode-normalization v0.1.23 -> v0.1.24
        Updating unicode-width v0.1.13 -> v0.1.14 (latest: v0.2.0)
        Updating version_check v0.9.4 -> v0.9.5
        Updating wasm-bindgen v0.2.92 -> v0.2.93
        Updating wasm-bindgen-backend v0.2.92 -> v0.2.93
        Updating wasm-bindgen-macro v0.2.92 -> v0.2.93
        Updating wasm-bindgen-macro-support v0.2.92 -> v0.2.93
        Updating wasm-bindgen-shared v0.2.92 -> v0.2.93
        Updating winapi-util v0.1.8 -> v0.1.9
          Adding windows-sys v0.59.0
        Updating winnow v0.6.13 -> v0.6.18
        Removing yaml-rust v0.4.5
          Adding zerocopy v0.7.35
          Adding zerocopy-derive v0.7.35
    note: pass `--verbose` to see 26 unchanged dependencies behind latest
    
    [ extracted from rust-lang#129538 - Trevor ]
    
    Co-authored-by: Trevor Gross <tmgross@umich.edu>
    github-actions and tgross35 committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    fb095cc View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    6915039 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    575df06 View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2024

  1. Rollup merge of rust-lang#129687 - Urgau:rfc3127-sysroot-2, r=jieyouxu

    Implement RFC3137 trim-paths sysroot changes - take 2
    
    This PR is a continuation of rust-lang#118149. Nothing really changed, except for rust-lang#129408 which I was able to trigger locally.
    
    Original description:
    
    > Implement parts of rust-lang#111540
    >
    > Right now, backtraces into sysroot always shows /rustc/$hash in diagnostics, e.g.
    >
    > ```
    > thread 'main' panicked at 'hello world', map-panic.rs:2:50
    > stack backtrace:
    >    0: std::panicking::begin_panic
    >              at /rustc/a55dd71d5fb0ec5a6a3a9e8c27b2127ba491ce52/library/std/src/panicking.rs:616:12
    >    1: map_panic::main::{{closure}}
    >              at ./map-panic.rs:2:50
    >    2: core::option::Option<T>::map
    >              at /rustc/a55dd71d5fb0ec5a6a3a9e8c27b2127ba491ce52/library/core/src/option.rs:929:29
    >    3: map_panic::main
    >              at ./map-panic.rs:2:30
    >    4: core::ops::function::FnOnce::call_once
    >              at /rustc/a55dd71d5fb0ec5a6a3a9e8c27b2127ba491ce52/library/core/src/ops/function.rs:248:5
    > note: Some details are omitted, run with `RUST_BACKTRACE=full` for a verbose backtrace.
    > ```
    >
    > [RFC 3127 said](https://rust-lang.github.io/rfcs/3127-trim-paths.html#changing-handling-of-sysroot-path-in-rustc)
    >
    > > We want to change this behaviour such that, when rust-src source files can be discovered, the virtual path is discarded and therefore the local path will be embedded, unless there is a --remap-path-prefix that causes this local path to be remapped in the usual way.
    >
    > This PR implements this behaviour. When `rust-src` is present at compile time, rustc replaces /rustc/$hash with a real path into local rust-src with best effort. To sanitise this, users must explicitly supply `--remap-path-prefix=<path to rust-src>=foo`.
    
    cc `@cbeuw`
    Fix rust-lang#105907
    Fix rust-lang#85463
    
    try-job: dist-x86_64-linux
    try-job: x86_64-msvc
    try-job: dist-x86_64-msvc
    try-job: armhf-gnu
    tgross35 authored Sep 27, 2024
    Configuration menu
    Copy the full SHA
    b8179ef View commit details
    Browse the repository at this point in the history
  2. Rollup merge of rust-lang#130313 - c410-f3r:unlock-rfc-2011, r=thomcc

    [`cfg_match`] Generalize inputs
    
    cc rust-lang#115585
    
    Changes the input type from `item` to `tt`, which makes the macro have the same functionality of `cfg_if`.
    
    Also adds a test to ensure that `stmt_expr_attributes` is not triggered.
    tgross35 authored Sep 27, 2024
    Configuration menu
    Copy the full SHA
    edae281 View commit details
    Browse the repository at this point in the history
  3. Rollup merge of rust-lang#130706 - GuillaumeGomez:remove-unneeded-jin…

    …ja-comments, r=notriddle
    
    [rustdoc] Remove unneeded jinja comments
    
    This is a follow-up of rust-lang#130585.
    
    Since we now check for the jinja comments we missed, we can now check for the jinja comments which are unneeded. It will make the parsing and therefore the compilation a tiny bit faster (well, if anyone sees a difference haha). The real goal is mostly to have easier to read template files. 😉
    
    r? `@notriddle`
    tgross35 authored Sep 27, 2024
    Configuration menu
    Copy the full SHA
    ca47bbc View commit details
    Browse the repository at this point in the history
  4. Rollup merge of rust-lang#130846 - ChrisDenton:revert-break, r=Noratrieb

    Revert Break into the debugger on panic (129019)
    
    This was talked about a bit at a recent libs meeting. While I think experimenting with this is worthwhile, I am nervous about this new behaviour reaching stable. We've already reverted on one tier 1 platform (Linux, rust-lang#130810) which means we have differing semantics on different tier 1 platforms. Also the fact it triggers even when `catch_unwind` is used to catch the panic means it can be very noisy in some projects.
    
    At the very least I think it could use some more discussion before being instantly stable. I think this could maybe be re-landed with an environment variable to control/override the behaviour. But that part would likely need a libs-api decision.
    
    cc ```@workingjubilee``` ```@kromych```
    tgross35 authored Sep 27, 2024
    Configuration menu
    Copy the full SHA
    2be6e14 View commit details
    Browse the repository at this point in the history
  5. Rollup merge of rust-lang#130873 - taiki-e:ppc64-atomic, r=Amanieu

    rustc_target: Add powerpc64 atomic-related features
    
    This adds the following two target features to unstable powerpc_target_feature.
    
    - `partword-atomics`: 8-bit and 16-bit atomic instructions (`l{b,h}arx` and `st{b,h}cx.`) ([definition in LLVM](https://github.com/llvm/llvm-project/blob/llvmorg-19.1.0/llvm/lib/Target/PowerPC/PPC.td#L170-L172))
    - `quadword-atomics`: 128-bit atomic instructions (`lqarx` and `stqcx.`) ([definition in LLVM](https://github.com/llvm/llvm-project/blob/llvmorg-19.1.0/llvm/lib/Target/PowerPC/PPC.td#L173-L175))
    
    Both features are [available on power8+](https://github.com/llvm/llvm-project/blob/llvmorg-19.1.0/llvm/lib/Target/PowerPC/PPC.td#L408-L422), so enabled by default for `powerpc64le-*` targets.
    
    r? ````@Amanieu````
    
    ````@rustbot```` label +O-PowerPC
    tgross35 authored Sep 27, 2024
    Configuration menu
    Copy the full SHA
    33fc2b9 View commit details
    Browse the repository at this point in the history
  6. Rollup merge of rust-lang#130875 - folkertdev:naked-asm-bootstrap, r=…

    …tgross35
    
    update `compiler-builtins` to 0.1.126
    
    this requires the addition of a bootstrap variant of the new `naked_asm!` macro
    
    r? ``@tgross35``
    
    extracted from rust-lang#128651
    tgross35 authored Sep 27, 2024
    Configuration menu
    Copy the full SHA
    de22bfc View commit details
    Browse the repository at this point in the history
  7. Rollup merge of rust-lang#130889 - tgross35:rustbook-cargo-update, r=…

    …tgross35
    
    Weekly `cargo update`: only `rustbook`
    
    We are having problems getting updates to merge due to CI failures. I took only the rustbook portion of rust-lang#129538 and put it into this PR, which hopefully should be able to successfully merge on its own.
    
    Original message:
    
    ```
    cargo update: rustbook
    
    rustbook dependencies:
         Locking 70 packages to latest compatible versions
        Removing adler v1.0.2
          Adding adler2 v2.0.0
        Updating anstream v0.6.14 -> v0.6.15
        Updating anstyle v1.0.7 -> v1.0.8
        Updating anstyle-parse v0.2.4 -> v0.2.5
        Updating anstyle-query v1.1.0 -> v1.1.1
        Updating anstyle-wincon v3.0.3 -> v3.0.4
        Updating anyhow v1.0.86 -> v1.0.89
        Removing base64 v0.22.1
        Updating bstr v1.9.1 -> v1.10.0
          Adding byteorder v1.5.0
        Updating cc v1.1.5 -> v1.1.21
        Updating clap v4.5.9 -> v4.5.18
        Updating clap_builder v4.5.9 -> v4.5.18
        Updating clap_complete v4.5.8 -> v4.5.29
        Updating clap_derive v4.5.8 -> v4.5.18
        Updating clap_lex v0.7.1 -> v0.7.2
        Updating colorchoice v1.0.1 -> v1.0.2
        Updating core-foundation-sys v0.8.6 -> v0.8.7
        Updating cpufeatures v0.2.12 -> v0.2.14
          Adding dateparser v0.2.1
        Removing deranged v0.3.11
        Updating env_filter v0.1.0 -> v0.1.2
        Updating env_logger v0.11.3 -> v0.11.5
        Updating fastrand v2.1.0 -> v2.1.1
        Updating flate2 v1.0.30 -> v1.0.33
        Updating iana-time-zone v0.1.60 -> v0.1.61
        Updating indexmap v2.2.6 -> v2.5.0
        Updating is_terminal_polyfill v1.70.0 -> v1.70.1
        Updating js-sys v0.3.69 -> v0.3.70
          Adding lazy_static v1.5.0
        Updating libc v0.2.155 -> v0.2.158
        Removing linked-hash-map v0.5.6
        Updating mdbook-i18n-helpers v0.3.4 -> v0.3.5
        Updating miniz_oxide v0.7.4 -> v0.8.0
        Updating normpath v1.2.0 -> v1.3.0
        Removing num-conv v0.1.0
        Updating opener v0.7.1 -> v0.7.2
        Updating pest v2.7.11 -> v2.7.13
        Updating pest_derive v2.7.11 -> v2.7.13
        Updating pest_generator v2.7.11 -> v2.7.13
        Updating pest_meta v2.7.11 -> v2.7.13
        Removing plist v1.7.0
        Removing powerfmt v0.2.0
        Updating ppv-lite86 v0.2.17 -> v0.2.20
          Adding pulldown-cmark v0.11.3 (latest: v0.12.1)
          Adding pulldown-cmark-escape v0.11.0
          Adding pulldown-cmark-to-cmark v15.0.1 (latest: v17.0.0)
        Removing quick-xml v0.32.0
        Updating quote v1.0.36 -> v1.0.37
        Updating redox_syscall v0.5.3 -> v0.5.4
        Updating regex v1.10.5 -> v1.10.6
        Updating rustix v0.38.34 -> v0.38.37
        Updating serde v1.0.204 -> v1.0.210
        Updating serde_derive v1.0.204 -> v1.0.210
        Updating serde_json v1.0.120 -> v1.0.128
        Updating serde_spanned v0.6.6 -> v0.6.7
        Updating syn v2.0.71 -> v2.0.77
        Updating tempfile v3.10.1 -> v3.12.0
        Updating thiserror v1.0.62 -> v1.0.63
        Updating thiserror-impl v1.0.62 -> v1.0.63
        Removing time v0.3.36
        Removing time-core v0.1.2
        Removing time-macros v0.2.18
        Updating toml v0.8.14 -> v0.8.19
        Updating toml_datetime v0.6.6 -> v0.6.8
        Updating toml_edit v0.22.15 -> v0.22.21
        Updating unicode-ident v1.0.12 -> v1.0.13
        Updating unicode-normalization v0.1.23 -> v0.1.24
        Updating unicode-width v0.1.13 -> v0.1.14 (latest: v0.2.0)
        Updating version_check v0.9.4 -> v0.9.5
        Updating wasm-bindgen v0.2.92 -> v0.2.93
        Updating wasm-bindgen-backend v0.2.92 -> v0.2.93
        Updating wasm-bindgen-macro v0.2.92 -> v0.2.93
        Updating wasm-bindgen-macro-support v0.2.92 -> v0.2.93
        Updating wasm-bindgen-shared v0.2.92 -> v0.2.93
        Updating winapi-util v0.1.8 -> v0.1.9
          Adding windows-sys v0.59.0
        Updating winnow v0.6.13 -> v0.6.18
        Removing yaml-rust v0.4.5
          Adding zerocopy v0.7.35
          Adding zerocopy-derive v0.7.35
    note: pass `--verbose` to see 26 unchanged dependencies behind latest
    ```
    tgross35 authored Sep 27, 2024
    Configuration menu
    Copy the full SHA
    6e13473 View commit details
    Browse the repository at this point in the history