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 8 pull requests #83880

Merged
merged 22 commits into from
Apr 5, 2021
Merged

Rollup of 8 pull requests #83880

merged 22 commits into from
Apr 5, 2021

Commits on Mar 9, 2021

  1. Use FromStr trait for number option parsing

    Replace `parse_uint` with generic `parse_number` based on `FromStr`.
    Use it for parsing inlining threshold to avoid casting later.
    tmiasko committed Mar 9, 2021
    Configuration menu
    Copy the full SHA
    1ec9057 View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2021

  1. Configuration menu
    Copy the full SHA
    a421cfe View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    120e5bd View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    06b3636 View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2021

  1. Configuration menu
    Copy the full SHA
    8a05892 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    72502e8 View commit details
    Browse the repository at this point in the history
  3. Add #[inline] to IpAddr methods

    Add some inlines to trivial methods of IpAddr
    Closes rust-lang#77583
    AngelicosPhosphoros committed Apr 3, 2021
    Configuration menu
    Copy the full SHA
    a3d0fa8 View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2021

  1. Use the beta compiler for building bootstrap tools when `download-rus…

    …tc` is set
    
     ## Motivation
    
    This avoids having to rebuild bootstrap and tidy each time you rebase
    over master. In particular, it makes rebasing and running `x.py fmt` on
    each commit in a branch significantly faster. It also avoids having to
    rebuild bootstrap after setting `download-rustc = true`.
    
     ## Implementation
    
    Instead of extracting the CI artifacts directly to `stage0/`, extract
    them to `ci-rustc/` instead. Continue to copy them to the proper
    sysroots as necessary for all stages except stage 0.
    
    This also requires `bootstrap.py` to download both stage0 and CI
    artifacts and distinguish between the two when checking stamp files.
    
    Note that since tools have to be built by the same compiler that built
    `rustc-dev` and the standard library, the downloaded artifacts can't be
    reused when building with the beta compiler. To make sure this is still
    a good user experience, warn when building with the beta compiler, and
    default to building with stage 2.
    jyn514 committed Apr 4, 2021
    Configuration menu
    Copy the full SHA
    14406df View commit details
    Browse the repository at this point in the history
  2. Render destructured struct function param names as underscore.

    Fixes rust-lang#83852
    
    r? `@GuillaumeGomez`
    eggyal committed Apr 4, 2021
    Configuration menu
    Copy the full SHA
    82b2863 View commit details
    Browse the repository at this point in the history
  3. Don't report disambiguator error if link would have been ignored

    This prevents us from warning on links such as `<hello@example.com>`.
    Note that we still warn on links such as `<hello@localhost>` because
    they have no dots in them. However, the links will still work, even
    though a warning is reported.
    camelid committed Apr 4, 2021
    Configuration menu
    Copy the full SHA
    45ccd50 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    01be6dd View commit details
    Browse the repository at this point in the history
  5. Renamed test

    eggyal committed Apr 4, 2021
    Configuration menu
    Copy the full SHA
    14fac68 View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2021

  1. Update Source Serif to release 4.004

    Now the family name is Source Serif 4 (upstream issue 77) instead of
    Source Serif Pro.
    tspiteri committed Apr 5, 2021
    Configuration menu
    Copy the full SHA
    29fed9a View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    70b0874 View commit details
    Browse the repository at this point in the history
  3. Rollup merge of rust-lang#81922 - magurotuna:issue81522, r=matthewjasper

    Let `#[allow(unstable_name_collisions)]` work for things other than function
    
    Fixes rust-lang#81522
    
    In addition to the report in rust-lang#81522, currently `#[allow(unstable_name_collisions)]` doesn't suppress the corresponding diagnostics even if this attribute is appended to an expression statement or a let statement. It seems like this is because the wrong `HirId` is passed to `struct_span_lint_hir`.
    It's fixed in this PR, and a regression test for it is also added.
    Dylan-DPC authored Apr 5, 2021
    Configuration menu
    Copy the full SHA
    54ea8e1 View commit details
    Browse the repository at this point in the history
  4. Rollup merge of rust-lang#82483 - tmiasko:option-from-str, r=matthewj…

    …asper
    
    Use FromStr trait for number option parsing
    
    Replace `parse_uint` with generic `parse_number` based on `FromStr`.
    Use it for parsing inlining threshold to avoid casting later.
    Dylan-DPC authored Apr 5, 2021
    Configuration menu
    Copy the full SHA
    e64dbb1 View commit details
    Browse the repository at this point in the history
  5. Rollup merge of rust-lang#82739 - jyn514:separate-stage0-stage1, r=Ma…

    …rk-Simulacrum
    
    Use the beta compiler for building bootstrap tools when `download-rustc` is set
    
     ## Motivation
    
    This avoids having to rebuild bootstrap and tidy each time you rebase
    over master. In particular, it makes rebasing and running `x.py fmt` on
    each commit in a branch significantly faster. It also avoids having to
    rebuild bootstrap after setting `download-rustc = true`.
    
     ## Implementation
    
    Instead of extracting the CI artifacts directly to `stage0/`, extract
    them to `ci-rustc/` instead. Continue to copy them to the proper
    sysroots as necessary for all stages except stage 0.
    
    This also requires `bootstrap.py` to download both stage0 and CI
    artifacts and distinguish between the two when checking stamp files.
    
    Note that since tools have to be built by the same compiler that built
    `rustc-dev` and the standard library, the downloaded artifacts can't be
    reused when building with the beta compiler. To make sure this is still
    a good user experience, warn when building with the beta compiler, and
    default to building with stage 2.
    
    I tested this by rebasing this PR from edeee91 over 1c77a1f and confirming that only the bootstrap library itself had to be rebuilt, not any dependencies and not `tidy`. I also tested that a clean build with `x.py build` builds rustdoc exactly once and does no other work, and that `touch src/librustdoc/lib.rs && x.py build` works. `x.py check` still behaves as before (checks using the beta compiler, even if there are changes to `compiler/`).
    
    Helps with rust-lang#81930.
    
    r? `@Mark-Simulacrum`
    Dylan-DPC authored Apr 5, 2021
    Configuration menu
    Copy the full SHA
    ca9cbea View commit details
    Browse the repository at this point in the history
  6. Rollup merge of rust-lang#83650 - tspiteri:source-serif-4, r=Guillaum…

    …eGomez
    
    Update Source Serif to release 4.004
    
    Now the family name is Source Serif 4 (upstream issue 77) instead of Source Serif Pro.
    Dylan-DPC authored Apr 5, 2021
    Configuration menu
    Copy the full SHA
    ad0a995 View commit details
    Browse the repository at this point in the history
  7. Rollup merge of rust-lang#83826 - slightlyoutofphase:rustdoc-sidebar-…

    …order-shuffle, r=jyn514
    
    List trait impls before deref methods in doc's sidebar
    
    This PR is acting directly on a suggestion made by ```````@jyn514``````` in rust-lang#83133. I've tested the changes locally, and can confirm that it does in fact properly achieve what he thought it would. This PR also in turn closes rust-lang#83133.
    Dylan-DPC authored Apr 5, 2021
    Configuration menu
    Copy the full SHA
    d60cf78 View commit details
    Browse the repository at this point in the history
  8. Rollup merge of rust-lang#83831 - AngelicosPhosphoros:issue-77583-inl…

    …ine-for-ip, r=m-ou-se
    
    Add `#[inline]` to IpAddr methods
    
    Add some inlines to trivial methods of IpAddr
    Closes rust-lang#77583
    Dylan-DPC authored Apr 5, 2021
    Configuration menu
    Copy the full SHA
    445aa40 View commit details
    Browse the repository at this point in the history
  9. Rollup merge of rust-lang#83863 - eggyal:issue-83852, r=jyn514

    Render destructured struct function param names as underscore
    
    Fixes rust-lang#83852
    
    r? ````@GuillaumeGomez````
    Dylan-DPC authored Apr 5, 2021
    Configuration menu
    Copy the full SHA
    98e7a4e View commit details
    Browse the repository at this point in the history
  10. Rollup merge of rust-lang#83865 - camelid:disamb-err-fix, r=jyn514

    Don't report disambiguator error if link would have been ignored
    
    Fixes rust-lang#83859.
    
    This prevents us from warning on links such as `<hello@example.com>`.
    Note that we still warn on links such as `<hello@localhost>` because
    they have no dots in them. However, the links will still work, even
    though a warning is reported.
    
    r? ````@jyn514````
    Dylan-DPC authored Apr 5, 2021
    Configuration menu
    Copy the full SHA
    3ca197e View commit details
    Browse the repository at this point in the history