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 13 pull requests #93738

Merged
merged 36 commits into from
Feb 7, 2022
Merged

Rollup of 13 pull requests #93738

merged 36 commits into from
Feb 7, 2022

Commits on Aug 25, 2021

  1. Make the pre-commit script pre-push instead

    This should make it substantially less annoying, and hopefully more
    people will find it useful. In particular, it will no longer run tidy
    each time you run `git commit --amend` or rebase a branch.
    
    This also warns if you have the old script in pre-commit; see the HACK
    comment for details.
    jyn514 committed Aug 25, 2021
    Configuration menu
    Copy the full SHA
    9d664b2 View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2022

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

Commits on Jan 27, 2022

  1. Configuration menu
    Copy the full SHA
    9b8e4c6 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    fb2d530 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    cef9b47 View commit details
    Browse the repository at this point in the history

Commits on Jan 28, 2022

  1. remove allow_fail test flag

    yuhaixin.hx committed Jan 28, 2022
    Configuration menu
    Copy the full SHA
    6562069 View commit details
    Browse the repository at this point in the history
  2. add allow_fail field in TestDesc to pass check

    yuhaixin.hx committed Jan 28, 2022
    Configuration menu
    Copy the full SHA
    0b8c9fb View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    4738ce4 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    c734c32 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    18cea90 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    91a43f0 View commit details
    Browse the repository at this point in the history

Commits on Jan 29, 2022

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

Commits on Feb 5, 2022

  1. Drop json::from_reader

    Performing UTF-8 decode outside the JSON module makes more sense in almost all cases.
    Mark-Simulacrum committed Feb 5, 2022
    Configuration menu
    Copy the full SHA
    0fb2b7a View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2022

  1. Configuration menu
    Copy the full SHA
    a4112dc View commit details
    Browse the repository at this point in the history
  2. Linkify sidebar headings for sibling items

    Also adjust CSS so this doesn't produce excess padding/margin.
    jsha committed Feb 6, 2022
    Configuration menu
    Copy the full SHA
    e27ebb5 View commit details
    Browse the repository at this point in the history
  3. Fix tracking issue for const_fn_trait_bound

    It previously pointed to rust-lang#57563, the conglomerate issue for
    `const fn` (presumably under the feature gate `const_fn`).
    `const_fn_trait_bounds` weren't mentioned here, so this commit changes
    its tracking issue to a new one.
    PatchMixolydic committed Feb 6, 2022
    Configuration menu
    Copy the full SHA
    57b102f View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    afb7a50 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    344ea6e View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    82a0122 View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2022

  1. Use shallow clones for submodules managed by rustbuild, not just boot…

    …strap.py
    
    I missed this in rust-lang#89757; it made
    `x.py test src/bootstrap` very slow.
    jyn514 committed Feb 7, 2022
    Configuration menu
    Copy the full SHA
    1870db6 View commit details
    Browse the repository at this point in the history
  2. Rerun bootstrap's build script when RUSTC changes

    Previously, rustbuild would give strange errors if you tried to reuse the same build directory under two names:
    
    ```
    $ mkdir tmp && cd tmp
    $ ../x.py check
    Building rustbuild
        Finished dev [unoptimized] target(s) in 35.27s
    Checking stage0 std artifacts (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
    ^C
    $ cd ..
    $ mv tmp/build build
    $ ./x.py check
    Building rustbuild
       Compiling bootstrap v0.0.0 (/home/jnelson/rust-lang/rust/src/bootstrap)
        Finished dev [unoptimized] target(s) in 11.18s
    
    failed to execute command: "/home/jnelson/rust-lang/rust/tmp/build/x86_64-unknown-linux-gnu/stage0/bin/rustc" "--target" "x86_64-unknown-linux-gnu" "--print" "target-libdir"
    error: No such file or directory (os error 2)
    ```
    
    This fixes the error. Reusing the same build directory is useful if you want to test path-things in
    bootstrap itself, without having to recompile it each time.
    
    For good measure, this also reruns the build script when PATH changes.
    jyn514 committed Feb 7, 2022
    Configuration menu
    Copy the full SHA
    b5b2150 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    14ff58c View commit details
    Browse the repository at this point in the history
  4. bootstrap: prefer using '--config' over 'RUST_BOOTSTRAP_CONFIG'

    Signed-off-by: Muhammad Falak R Wani <[email protected]>
    mfrw committed Feb 7, 2022
    Configuration menu
    Copy the full SHA
    95054de View commit details
    Browse the repository at this point in the history
  5. Rollup merge of rust-lang#88313 - jyn514:pre-push, r=Mark-Simulacrum

    Make the pre-commit script pre-push instead
    
    This should make it substantially less annoying, and hopefully more
    people will find it useful. In particular, it will no longer run tidy
    each time you run `git commit --amend` or rebase a branch.
    
    This also warns if you have the old script in pre-commit; see the HACK
    comment for details.
    
    r? ````@Mark-Simulacrum```` cc ````@caass````
    m-ou-se authored Feb 7, 2022
    Configuration menu
    Copy the full SHA
    aee13fb View commit details
    Browse the repository at this point in the history
  6. Rollup merge of rust-lang#91530 - bobrippling:suggest-1-tuple-parens,…

    … r=camelid
    
    Suggest 1-tuple parentheses on exprs without existing parens
    
    A follow-on from rust-lang#86116, split out from rust-lang#90677.
    
    This alters the suggestion to add a trailing comma to create a 1-tuple - previously we would only apply this if the relevant expression was parenthesised. We now make the suggestion regardless of parentheses, which reduces the fragility of the check (w.r.t formatting).
    
    e.g.
    ```rust
    let a: Option<(i32,)> = Some(3);
    ```
    
    gets the below suggestion:
    
    ```rust
    let a: Option<(i32,)> = Some((3,));
    //                           ^ ^^
    ```
    
    This change also improves the suggestion in other ways, such as by only making the suggestion if the types would match after the suggestion is applied and making the suggestion a multipart suggestion.
    m-ou-se authored Feb 7, 2022
    Configuration menu
    Copy the full SHA
    557d300 View commit details
    Browse the repository at this point in the history
  7. Rollup merge of rust-lang#92724 - inteon:cleanup, r=Mark-Simulacrum

    Cleanup c_str.rs
    
    Some code cleanups in `c_str.rs`.
    No functional changes.
    
    ref: bytecodealliance/rustix#163
    m-ou-se authored Feb 7, 2022
    Configuration menu
    Copy the full SHA
    8219ad4 View commit details
    Browse the repository at this point in the history
  8. Rollup merge of rust-lang#93208 - kellerkindt:wrapping_int_assign_imp…

    …l, r=m-ou-se
    
    Impl {Add,Sub,Mul,Div,Rem,BitXor,BitOr,BitAnd}Assign<$t> for Wrapping<$t> for rust 1.60.0
    
    Tracking issue rust-lang#93204
    
    This is about adding basic integer operations to the `Wrapping` type:
    
    ```rust
    let mut value = Wrapping(2u8);
    value += 3u8;
    value -= 1u8;
    value *= 2u8;
    value /= 2u8;
    value %= 2u8;
    value ^= 255u8;
    value |= 123u8;
    value &= 2u8;
    ```
    
    Because this adds stable impls on a stable type, it runs into the following issue if an `#[unstable(...)]` attribute is used:
    
    ```
    an `#[unstable]` annotation here has no effect
    note: see issue rust-lang#55436 <rust-lang#55436> for more information
    ```
    
    This means - if I understood this correctly - the new impls have to be stabilized instantly.
    Which in turn means, this PR has to kick of an FCP on the tracking issue as well?
    
    This impl is analog to 1c0dc18 rust-lang#92356 for the `Saturating` type ``@dtolnay``  ``@Mark-Simulacrum``
    m-ou-se authored Feb 7, 2022
    Configuration menu
    Copy the full SHA
    e3c972e View commit details
    Browse the repository at this point in the history
  9. Rollup merge of rust-lang#93394 - m-ou-se:fix-93378, r=estebank

    Don't allow {} to refer to implicit captures in format_args.
    
    Fixes rust-lang#93378
    m-ou-se authored Feb 7, 2022
    Configuration menu
    Copy the full SHA
    4445a8f View commit details
    Browse the repository at this point in the history
  10. Rollup merge of rust-lang#93416 - name1e5s:chore/remove_allow_fail, r…

    …=m-ou-se
    
    remove `allow_fail` test flag
    
    close rust-lang#93345
    m-ou-se authored Feb 7, 2022
    Configuration menu
    Copy the full SHA
    252ff5e View commit details
    Browse the repository at this point in the history
  11. Rollup merge of rust-lang#93487 - yerke:yerke/fix-link-toolchain-in-s…

    …etup, r=Mark-Simulacrum
    
    Fix linking stage1 toolchain in `./x.py setup`
    
    Closes [92319](rust-lang#92319)
    
    Fix linking stage1 toolchain in `./x.py setup`. I guess this can be considered a follow up to rust-lang#89212 by `````@Sl1mb0.`````
    
    We create 2 directories and 1 file that are required by rustup to [link a custom toolchain from path](https://github.com/rust-lang/rustup/blob/5225e87a5d974ab5f1626bcb2a7b43f76ab883f0/src/toolchain.rs#L479-L497).
    
    cc `````@jyn514````` and `````@Mark-Simulacrum````` as they were active in rust-lang#89206
    m-ou-se authored Feb 7, 2022
    Configuration menu
    Copy the full SHA
    f611de0 View commit details
    Browse the repository at this point in the history
  12. Rollup merge of rust-lang#93673 - jsha:linkify-sidebar-headings, r=Gu…

    …illaumeGomez
    
    Linkify sidebar headings for sibling items
    
    Also adjust CSS so this doesn't produce excess padding/margin.
    
    Note: I tried and failed to write a test with browser-UI-test. First I tried to `assert-property: (".block.mod h3 a", {"href": "index.html#macros"})`. But the `href` that gets read out is the fully-quallified URL, starting with `file:///`. That URL will differ depending on what path the test is run from, so that doesn't work.
    
    Next I tried clicking on the appropriate sidebar link, and verifying that the appropriate heading on the next page is highlighted with the right background color. However, that also didn't work: according to browser-UI-test, the targeted heading was plain white. However, running with no-headless, I could see that it actually was yellow. I suspect this is a bug in the older version of Chromium used with browser-UI-test's bundled puppeteer, since it doesn't reproduce on latest Chrome.
    
    Fixes rust-lang#92957
    
    Demo: https://rustdoc.crud.net/jsha/linkify-sidebar-headings/std/string/trait.ToString.html
    
    r? ``@GuillaumeGomez``
    m-ou-se authored Feb 7, 2022
    Configuration menu
    Copy the full SHA
    0b6c7fb View commit details
    Browse the repository at this point in the history
  13. Rollup merge of rust-lang#93680 - Mark-Simulacrum:drop-json-reader, r…

    …=bjorn3
    
    Drop json::from_reader
    
    Just a small cleanup -- this was essentially unused; the one use site is better suited to reading from &str regardless.
    m-ou-se authored Feb 7, 2022
    Configuration menu
    Copy the full SHA
    bd245fa View commit details
    Browse the repository at this point in the history
  14. Rollup merge of rust-lang#93682 - PatchMixolydic:where-in-the-world-i…

    …s-const_fn_trait_bound, r=oli-obk
    
    Update tracking issue for `const_fn_trait_bound`
    
    It previously pointed to rust-lang#57563, the conglomerate issue for `const fn` (presumably under the feature gate `const_fn`). This tracking issue doesn't mention anything about `const_fn_trait_bound`(the only occurrence of "trait bound" is for the now-removed `?const Trait` syntax), which can be confusing to people who want to find out more about trait bounds on `const fn`s. This pull request changes the tracking issue to one meant specifically for `const_fn_trait_bound`, rust-lang#93706, which can help collect information on this feature's stabilization and point users towards `const_trait_impl` if they're looking for const-in-const-contexts trait bounds.
    
    Fixes rust-lang#93679.
    
    `````@rustbot````` modify labels +A-const-fn +F-const_trait_impl
    m-ou-se authored Feb 7, 2022
    Configuration menu
    Copy the full SHA
    f4377a8 View commit details
    Browse the repository at this point in the history
  15. Rollup merge of rust-lang#93722 - jyn514:less-submodule-cloning, r=Ma…

    …rk-Simulacrum
    
    Use shallow clones for submodules managed by rustbuild, not just bootstrap.py
    
    I missed this in rust-lang#89757; it made
    `x.py test src/bootstrap` very slow.
    m-ou-se authored Feb 7, 2022
    Configuration menu
    Copy the full SHA
    82fe6ed View commit details
    Browse the repository at this point in the history
  16. Rollup merge of rust-lang#93723 - jyn514:rerun-if-changed, r=Mark-Sim…

    …ulacrum
    
    Rerun bootstrap's build script when RUSTC changes
    
    Previously, rustbuild would give strange errors if you tried to reuse the same build directory under two names:
    
    ```
    $ mkdir tmp && cd tmp
    $ ../x.py check
    Building rustbuild
        Finished dev [unoptimized] target(s) in 35.27s
    Checking stage0 std artifacts (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
    ^C
    $ cd ..
    $ mv tmp/build build
    $ ./x.py check
    Building rustbuild
       Compiling bootstrap v0.0.0 (/home/jnelson/rust-lang/rust/src/bootstrap)
        Finished dev [unoptimized] target(s) in 11.18s
    
    failed to execute command: "/home/jnelson/rust-lang/rust/tmp/build/x86_64-unknown-linux-gnu/stage0/bin/rustc" "--target" "x86_64-unknown-linux-gnu" "--print" "target-libdir"
    error: No such file or directory (os error 2)
    ```
    
    This fixes the error. Reusing the same build directory is useful if you want to test path-related things in
    bootstrap itself, without having to recompile it each time.
    
    For good measure, this also reruns the build script when PATH changes.
    m-ou-se authored Feb 7, 2022
    Configuration menu
    Copy the full SHA
    0f9d3b4 View commit details
    Browse the repository at this point in the history
  17. Rollup merge of rust-lang#93737 - mfrw:mfrw/bootstrap-config, r=Mark-…

    …Simulacrum
    
    bootstrap: prefer using '--config' over 'RUST_BOOTSTRAP_CONFIG'
    
    Signed-off-by: Muhammad Falak R Wani <[email protected]>
    
    Closes: rust-lang#93725
    Rleated: rust-lang#92260
    m-ou-se authored Feb 7, 2022
    Configuration menu
    Copy the full SHA
    a6c4810 View commit details
    Browse the repository at this point in the history