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 10 pull requests #98680

Merged
merged 27 commits into from
Jun 29, 2022
Merged

Rollup of 10 pull requests #98680

merged 27 commits into from
Jun 29, 2022

Commits on Jun 27, 2022

  1. Ensure that static_crt is set in the bootstrapper whenever using `c…

    …c` to get a compiler command line.
    
    When attempting to build rustc with LLVM on Windows, I noticed that the CRT flag provided to the C and C++ Compilers was inconsistent:
    
    ```
    "-DCMAKE_C_FLAGS=-nologo -MT -Brepro" "-DCMAKE_CXX_FLAGS=-nologo -MD -Brepro"
    ```
    
    Since the bootstrapper also sets the various `LLVM_USE_CRT` variables, this resulted in cl.exe reporting a bunch of warnings:
    
    ```
    cl : Command line warning D9025 : overriding '/MD' with '/MT'
    ```
    
    The root cause for this is that `cc_detect::find` was creating a `cc::Build` twice, but didn't set `static_crt` the second time.
    
    It's possible that this what is also causing rust-lang#81381
    dpaoliello committed Jun 27, 2022
    Configuration menu
    Copy the full SHA
    1fca246 View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2022

  1. Configuration menu
    Copy the full SHA
    b292d94 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    cd88bb3 View commit details
    Browse the repository at this point in the history
  3. Make consts mod private

    voidc committed Jun 28, 2022
    Configuration menu
    Copy the full SHA
    0805252 View commit details
    Browse the repository at this point in the history
  4. Address code review comments

    voidc committed Jun 28, 2022
    Configuration menu
    Copy the full SHA
    053f48d View commit details
    Browse the repository at this point in the history
  5. Fix rust-lang#98260, added the test case

    Yan Chen committed Jun 28, 2022
    Configuration menu
    Copy the full SHA
    f97326d View commit details
    Browse the repository at this point in the history
  6. Update cargo

    ehuss committed Jun 28, 2022
    Configuration menu
    Copy the full SHA
    78c9790 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    cec6988 View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2022

  1. rustdoc: fix keyboard shortcuts bug in settings menu

    This commit fixes the keyboard shorts code to call localStorage every time a
    key is pressed. This matters because you're supposed to be able to change a
    setting and have it immediately take effect.
    notriddle committed Jun 29, 2022
    Configuration menu
    Copy the full SHA
    cb8a738 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    f5f42a8 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    ccea908 View commit details
    Browse the repository at this point in the history
  4. alloc: fix no_global_oom_handling warnings

    Rust 1.62.0 introduced a couple new `unused_imports` warnings
    in `no_global_oom_handling` builds, making a total of 5 warnings:
    
    ```txt
    warning: unused import: `Unsize`
     --> library/alloc/src/boxed/thin.rs:6:33
      |
    6 | use core::marker::{PhantomData, Unsize};
      |                                 ^^^^^^
      |
      = note: `#[warn(unused_imports)]` on by default
    
    warning: unused import: `from_fn`
      --> library/alloc/src/string.rs:51:18
       |
    51 | use core::iter::{from_fn, FusedIterator};
       |                  ^^^^^^^
    
    warning: unused import: `core::ops::Deref`
      --> library/alloc/src/vec/into_iter.rs:12:5
       |
    12 | use core::ops::Deref;
       |     ^^^^^^^^^^^^^^^^
    
    warning: associated function `shrink` is never used
       --> library/alloc/src/raw_vec.rs:424:8
        |
    424 |     fn shrink(&mut self, cap: usize) -> Result<(), TryReserveError> {
        |        ^^^^^^
        |
        = note: `#[warn(dead_code)]` on by default
    
    warning: associated function `forget_remaining_elements` is never used
       --> library/alloc/src/vec/into_iter.rs:126:19
        |
    126 |     pub(crate) fn forget_remaining_elements(&mut self) {
        |                   ^^^^^^^^^^^^^^^^^^^^^^^^^
    ```
    
    This patch cleans them so that projects compiling `alloc` without
    infallible allocations do not see the warnings. It also enables
    the use of `-Dwarnings`.
    
    The couple `dead_code` ones may be reverted when some fallible
    allocation support starts using them.
    
    Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
    ojeda committed Jun 29, 2022
    Configuration menu
    Copy the full SHA
    83addf2 View commit details
    Browse the repository at this point in the history
  5. alloc: ensure no_global_oom_handling builds are warning-free

    Rust 1.62.0 introduced a couple new `unused_imports` warnings
    in `no_global_oom_handling` builds, making a total of 5 warnings.
    
    To avoid accumulating more over time, let's keep the builds
    warning-free. This ensures projects compiling `alloc` without
    infallible allocations do not see the warnings in the future
    and that they can keep enabling `-Dwarnings`.
    
    Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
    ojeda committed Jun 29, 2022
    Configuration menu
    Copy the full SHA
    60dc54e View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    a84e19d View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    d048b15 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    3cbf864 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    6212e6b View commit details
    Browse the repository at this point in the history
  10. Rollup merge of rust-lang#98434 - dpaoliello:staticcrt, r=jyn514

    Ensure that `static_crt` is set in the bootstrapper whenever using `cc-rs` to get a compiler command line.
    
    When attempting to build rustc with LLVM on Windows, I noticed that the CRT flag provided to the C and C++ Compilers was inconsistent:
    
    ```
    "-DCMAKE_C_FLAGS=-nologo -MT -Brepro" "-DCMAKE_CXX_FLAGS=-nologo -MD -Brepro"
    ```
    
    Since the bootstrapper also sets the various `LLVM_USE_CRT` variables, this resulted in cl.exe reporting a bunch of warnings:
    
    ```
    cl : Command line warning D9025 : overriding '/MD' with '/MT'
    ```
    
    The root cause for this is that `cc_detect::find` was creating a `cc::Build` twice, but didn't set `static_crt` the second time.
    
    It's possible that this what is also causing rust-lang#81381
    matthiaskrgr committed Jun 29, 2022
    Configuration menu
    Copy the full SHA
    96bb98c View commit details
    Browse the repository at this point in the history
  11. Rollup merge of rust-lang#98636 - ehuss:mentions-wrapping, r=Mark-Sim…

    …ulacrum
    
    Triagebot: Fix mentions word wrapping.
    
    I forgot that GitHub's markdown treats newlines as hard breaks. This was causing some ugly-looking word wrapping in the triagebot mention messages. This fixes it so that the lines are not hard-wrapped.
    matthiaskrgr committed Jun 29, 2022
    Configuration menu
    Copy the full SHA
    17d3868 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    05c0b2e View commit details
    Browse the repository at this point in the history
  13. Rollup merge of rust-lang#98643 - voidc:valtree-ref-pretty, r=lcnr

    Improve pretty printing of valtrees for references
    
    This implements the changes outlined in rust-lang#66451 (comment).
    
    r? `@lcnr`
    Fixes rust-lang#66451
    matthiaskrgr committed Jun 29, 2022
    Configuration menu
    Copy the full SHA
    921e311 View commit details
    Browse the repository at this point in the history
  14. Rollup merge of rust-lang#98646 - notriddle:notriddle/main.js, r=Guil…

    …laumeGomez
    
    rustdoc: fix bugs in main.js popover help and settings
    matthiaskrgr committed Jun 29, 2022
    Configuration menu
    Copy the full SHA
    1fef19a View commit details
    Browse the repository at this point in the history
  15. Rollup merge of rust-lang#98647 - ehuss:update-cargo, r=ehuss

    Update cargo
    
    2 commits in a5e08c4703f202e30cdaf80ca3e7c00baa59c496..dbff32b27893b899ae2397f3d56d1be111041d56
    2022-06-23 20:12:03 +0000 to 2022-06-24 19:25:13 +0000
    - Fetch GitHub commits by long hash more efficiently (rust-lang/cargo#10079)
    - refactor(test): Clarify asserts are for UI (rust-lang/cargo#10778)
    matthiaskrgr committed Jun 29, 2022
    Configuration menu
    Copy the full SHA
    2c702c2 View commit details
    Browse the repository at this point in the history
  16. Rollup merge of rust-lang#98652 - ojeda:warning-free-no_global_oom_ha…

    …ndling, r=joshtriplett
    
    `alloc`: clean and ensure `no_global_oom_handling`  builds are warning-free
    
    Rust 1.62.0 introduced a couple new `unused_imports` warnings
    in `no_global_oom_handling` builds, making a total of 5 warnings.
    
    <details>
    
    ```txt
    warning: unused import: `Unsize`
     --> library/alloc/src/boxed/thin.rs:6:33
      |
    6 | use core::marker::{PhantomData, Unsize};
      |                                 ^^^^^^
      |
      = note: `#[warn(unused_imports)]` on by default
    
    warning: unused import: `from_fn`
      --> library/alloc/src/string.rs:51:18
       |
    51 | use core::iter::{from_fn, FusedIterator};
       |                  ^^^^^^^
    
    warning: unused import: `core::ops::Deref`
      --> library/alloc/src/vec/into_iter.rs:12:5
       |
    12 | use core::ops::Deref;
       |     ^^^^^^^^^^^^^^^^
    
    warning: associated function `shrink` is never used
       --> library/alloc/src/raw_vec.rs:424:8
        |
    424 |     fn shrink(&mut self, cap: usize) -> Result<(), TryReserveError> {
        |        ^^^^^^
        |
        = note: `#[warn(dead_code)]` on by default
    
    warning: associated function `forget_remaining_elements` is never used
       --> library/alloc/src/vec/into_iter.rs:126:19
        |
    126 |     pub(crate) fn forget_remaining_elements(&mut self) {
        |                   ^^^^^^^^^^^^^^^^^^^^^^^^^
    ```
    
    </details>
    
    This PR cleans them and ensures no new ones are introduced
    so that projects compiling `alloc` without infallible allocations
    do not see them (and may want to enable `-Dwarnings`).
    
    The couple `dead_code` ones may be reverted when some fallible
    allocation support starts using them.
    matthiaskrgr committed Jun 29, 2022
    Configuration menu
    Copy the full SHA
    7dedec7 View commit details
    Browse the repository at this point in the history
  17. Rollup merge of rust-lang#98660 - eddyb:invalid-punct-stage1, r=lqd

    Unbreak stage1 tests via ignore-stage1 in `proc-macro/invalid-punct-ident-1.rs`.
    
    rust-lang#98188 broke `./x.py test --stage 1` (which I thought we ran in PR CI, cc `@rust-lang/infra)` i.e. the default `./x.py test` in dev checkouts, as the panic in `src/test/ui/proc-macro/invalid-punct-ident-1.rs` moved from the server (`rustc`) to the client (proc macro), and that means it's now affected by rust-lang#59998.
    
    I made the test look like `src/test/ui-fulldeps/issue-76270-panic-in-libproc-macro.rs` tho I'm a bit confused why that one is in `src/test/ui-fulldeps`, it should still work in `src/test/ui`, no? (cc `@Aaron1011)`
    matthiaskrgr committed Jun 29, 2022
    Configuration menu
    Copy the full SHA
    bba00b5 View commit details
    Browse the repository at this point in the history
  18. Rollup merge of rust-lang#98665 - ChrisDenton:deprecated-suggestion, …

    …r=compiler-errors
    
    Use verbose help for deprecation suggestion
    
    Fixes rust-lang#98631
    
    r? `@compiler-errors`
    matthiaskrgr committed Jun 29, 2022
    Configuration menu
    Copy the full SHA
    d708bc4 View commit details
    Browse the repository at this point in the history
  19. Rollup merge of rust-lang#98668 - TaKO8Ki:avoid-many-&str-to-string-c…

    …onversions, r=Dylan-DPC
    
    Avoid some `&str` to `String` conversions with `MultiSpan::push_span_label`
    
    This patch removes some`&str` to `String` conversions with `MultiSpan::push_span_label`.
    matthiaskrgr committed Jun 29, 2022
    Configuration menu
    Copy the full SHA
    d34c4ca View commit details
    Browse the repository at this point in the history