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

Merged
merged 20 commits into from
Mar 20, 2023
Merged

Rollup of 8 pull requests #109384

merged 20 commits into from
Mar 20, 2023

Commits on Mar 15, 2023

  1. Set CMAKE_SYSTEM_NAME for Linux targets

    When bootstrap compiles native dependencies like LLVM, it should set
    CMAKE_SYSTEM_NAME for the target system; otherwise cmake may not
    identify that it is cross-compiling.
    
    In particular, when building a Linux rustc on a macOS host, cmake was
    including `-isysroot /path/to/macOS.sdk` options that caused things to
    break.  By setting `CMAKE_SYSTEM_NAME=Linux` when building for Linux
    targets, the macOS SDK is no longer passed as sysroot to the compiler.
    eggyal committed Mar 15, 2023
    Configuration menu
    Copy the full SHA
    d10b113 View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2023

  1. Configuration menu
    Copy the full SHA
    5e0fc04 View commit details
    Browse the repository at this point in the history
  2. Add tests for configure.py

    - Separate out functions so that each unit test doesn't create a file on disk
    - Add a few unit tests
    
    Notably, verifying that we generate valid toml relies on python 3.11 so
    we can use `tomllib`.
    jyn514 committed Mar 17, 2023
    Configuration menu
    Copy the full SHA
    d808bc2 View commit details
    Browse the repository at this point in the history
  3. Use python3.11 in CI to make sure toml is validated

    This also fixes a regression from
    rust-lang#106085 which stopped testing that
    we support python2 in PR CI.
    jyn514 committed Mar 17, 2023
    Configuration menu
    Copy the full SHA
    c7eccda View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    0d53565 View commit details
    Browse the repository at this point in the history
  5. Switch impls of is_sorted_by between slices and slice iters

    This makes a bit more sense — iter impl converts to slice first, while
    slice impl used to create iter, doing unnecessary conversions.
    WaffleLapkin committed Mar 17, 2023
    Configuration menu
    Copy the full SHA
    c2ccdfa View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    9139ed0 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    640c202 View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2023

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

Commits on Mar 19, 2023

  1. Update mdbook

    ehuss committed Mar 19, 2023
    Configuration menu
    Copy the full SHA
    18ea16c View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    252fa78 View commit details
    Browse the repository at this point in the history
  3. Reformat type_of

    compiler-errors committed Mar 19, 2023
    Configuration menu
    Copy the full SHA
    dbedf40 View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2023

  1. Rollup merge of rust-lang#109170 - eggyal:xc-linux-cmake, r=Mark-Simu…

    …lacrum
    
    Set `CMAKE_SYSTEM_NAME` for Linux targets
    
    When bootstrap compiles native dependencies like LLVM, it should set `CMAKE_SYSTEM_NAME` for the target system; otherwise cmake may not identify that it is cross-compiling.
    
    In particular, when building a Linux rustc on a macOS host, cmake was including `-isysroot /path/to/macOS.sdk` options that caused things to break.  By setting `CMAKE_SYSTEM_NAME=Linux` when building for Linux targets, the macOS SDK is no longer passed as sysroot to the compiler.
    
    r? bootstrap
    matthiaskrgr authored Mar 20, 2023
    Configuration menu
    Copy the full SHA
    96d5dd6 View commit details
    Browse the repository at this point in the history
  2. Rollup merge of rust-lang#109266 - petrochenkov:docice4, r=petrochenkov

    rustdoc: Correctly merge import's and its target's docs in one more case
    
    Fixes rust-lang#108334.
    Fixes rust-lang#108378.
    Fixes rust-lang#108658.
    matthiaskrgr authored Mar 20, 2023
    Configuration menu
    Copy the full SHA
    0e8085a View commit details
    Browse the repository at this point in the history
  3. Rollup merge of rust-lang#109267 - jyn514:test-configure, r=Mark-Simu…

    …lacrum
    
    Add tests for configure.py
    
    I highly recommend reviewing this with whitespace disabled.
    
    Notably, verifying that we generate valid toml relies on python 3.11 so
    we can use `tomllib`, so this also switches`x86_64-gnu-llvm-14` (one of the PR builders) to use 3.11.
    
    While fixing that, I noticed that we stopped testing python2.7 support on PR CI in rust-lang#106085. `@fee1-dead` `@pietroalbini` please be more careful in the future, there is no CI for CI itself that verifies we are testing everything we should be.
    
    - Separate out functions so that each unit test doesn't create a file on disk
    - Add a few unit tests
    matthiaskrgr authored Mar 20, 2023
    Configuration menu
    Copy the full SHA
    023079f View commit details
    Browse the repository at this point in the history
  4. Rollup merge of rust-lang#109273 - WaffleLapkin:slice_is_sorted_by_ar…

    …ray_windows, r=scottmcm
    
    Make `slice::is_sorted_by` implementation nicer
    
    Just tweak implementation a little :)
    
    r? `@thomcc`
    matthiaskrgr authored Mar 20, 2023
    Configuration menu
    Copy the full SHA
    88caa29 View commit details
    Browse the repository at this point in the history
  5. Rollup merge of rust-lang#109277 - spastorino:new-rpitit-14, r=compil…

    …er-errors
    
    Fix generics_of for impl's RPITIT synthesized associated type
    
    The only useful commit is the last one.
    
    This makes `generics_of` for the impl side RPITIT copy from the trait's associated type and avoid the fn on the impl side which was previously wrongly used.
    This solution is better but we still need to fix resolution of the generated generics.
    
    r? ``@compiler-errors``
    matthiaskrgr authored Mar 20, 2023
    Configuration menu
    Copy the full SHA
    d86fd83 View commit details
    Browse the repository at this point in the history
  6. Rollup merge of rust-lang#109307 - cjgillot:inline-location, r=compil…

    …er-errors
    
    Ignore `Inlined` spans when computing caller location.
    
    Fixes rust-lang#105538
    matthiaskrgr authored Mar 20, 2023
    Configuration menu
    Copy the full SHA
    3efecba View commit details
    Browse the repository at this point in the history
  7. Rollup merge of rust-lang#109364 - compiler-errors:gat-const-arg, r=B…

    …oxyUwU
    
    Only expect a GAT const param for `type_of` of GAT const arg
    
    IDK why we were account for both `is_ty_or_const` instead of just for a const param, since we're computing the `type_of` a const param specifically.
    
    Fixes rust-lang#109300
    matthiaskrgr authored Mar 20, 2023
    Configuration menu
    Copy the full SHA
    f21c435 View commit details
    Browse the repository at this point in the history
  8. Rollup merge of rust-lang#109365 - ehuss:update-mdbook, r=Mark-Simula…

    …crum
    
    Update mdbook
    
    This updates mdbook from 0.4.25 to 0.4.28.
    Changelog: https://github.com/rust-lang/mdBook/blob/master/CHANGELOG.md#mdbook-0428
    
    The primary changes are some interaction fixes for Mobile Safari and removing custom scrollbars on webkit browsers, along with a few other fixes.
    matthiaskrgr authored Mar 20, 2023
    Configuration menu
    Copy the full SHA
    58ffabb View commit details
    Browse the repository at this point in the history