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 6 pull requests #112485

Merged
merged 19 commits into from
Jun 10, 2023
Merged

Rollup of 6 pull requests #112485

merged 19 commits into from
Jun 10, 2023

Commits on Jun 4, 2023

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

Commits on Jun 7, 2023

  1. Improve sorting in debug_dump.

    Currently it sorts by symbol name, which is a mangled name like
    `_ZN1a4main17hb29587cdb6db5f42E`, which leads to non-obvious orderings.
    
    This commit changes it to use the existing
    `items_in_deterministic_order`, which iterates in source code order.
    nnethercote committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    9fd6d97 View commit details
    Browse the repository at this point in the history
  2. Make the two loops in internalize_symbols have the same form.

    Because the next commit will merge them.
    nnethercote committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    392045b View commit details
    Browse the repository at this point in the history
  3. Merge the two loops in internalize_symbols.

    Because they have a lot of overlap.
    nnethercote committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    fe3b646 View commit details
    Browse the repository at this point in the history
  4. Split loop in place_inlined_mono_item.

    This loop is doing two different things. For inlined items, it's adding
    them to the CGU. For all items, it's recording them in
    `mono_item_placements`.
    
    This commit splits it into two separate loops. This avoids putting root
    mono items into `reachable`, and removes the low-value check that
    `roots` doesn't contain inlined mono items.
    nnethercote committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    8dbb347 View commit details
    Browse the repository at this point in the history
  5. Remove PlacedRootMonoItems::roots.

    It's no longer used.
    nnethercote committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    1defd30 View commit details
    Browse the repository at this point in the history
  6. Move mono_item_placement construction.

    It's currently created in `place_inlined_mono_items` and then used in
    `internalize_symbols`. This commit moves the creation to
    `internalize_symbols`.
    nnethercote committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    8533456 View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2023

  1. Configuration menu
    Copy the full SHA
    7f79ceb View commit details
    Browse the repository at this point in the history
  2. Change format of rustdoc-js tests by putting query and correction

    … directly alongside the expected values
    GuillaumeGomez committed Jun 9, 2023
    Configuration menu
    Copy the full SHA
    6b0c7c4 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    9803651 View commit details
    Browse the repository at this point in the history
  4. Update cargo

    weihanglo committed Jun 9, 2023
    Configuration menu
    Copy the full SHA
    a655b4d View commit details
    Browse the repository at this point in the history
  5. expand: Change how #![cfg(FALSE)] behaves on crate root

    Previously it removed all other attributes from the crate root.
    Now it removes only attributes below itself.
    
    So it becomes possible to configure some global crate properties even for fully unconfigured crates.
    petrochenkov committed Jun 9, 2023
    Configuration menu
    Copy the full SHA
    46becfd View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    3152ac3 View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2023

  1. Rollup merge of rust-lang#110141 - petrochenkov:cratecfg2, r=WaffleLa…

    …pkin
    
    expand: Change how `#![cfg(FALSE)]` behaves on crate root
    
    Previously it removed all other attributes from the crate root.
    Now it removes only attributes below itself (during both regular expansion and pre-configuration).
    
    So it becomes possible to configure some global crate properties even for fully unconfigured crates.
    
    Fixes rust-lang#104633
    Part of rust-lang#110082
    matthiaskrgr authored Jun 10, 2023
    Configuration menu
    Copy the full SHA
    2baebad View commit details
    Browse the repository at this point in the history
  2. Rollup merge of rust-lang#112369 - nnethercote:more-cgu-cleanups, r=w…

    …esleywiser
    
    More CGU cleanups
    
    An assortment of improvements.
    
    r? `@wesleywiser`
    matthiaskrgr authored Jun 10, 2023
    Configuration menu
    Copy the full SHA
    3189ce6 View commit details
    Browse the repository at this point in the history
  3. Rollup merge of rust-lang#112467 - sigaloid:master, r=albertlarsan68

    Compile rustc_driver by default
    
    Fixes rust-lang#112440. It now properly compiles `rustc_driver` and opens the doc page.
    matthiaskrgr authored Jun 10, 2023
    Configuration menu
    Copy the full SHA
    4d36c84 View commit details
    Browse the repository at this point in the history
  4. Rollup merge of rust-lang#112468 - GuillaumeGomez:change-rustdoc-js-f…

    …ormats, r=notriddle
    
    Change format of rustdoc-js tests by putting query and correction directly alongside the expected values
    
    As I was working on fixing merge conflicts in rust-lang#108537, I faced quite a big issue when trying to update the `rustdoc-js*` tests. To make it much simpler, this PR moves the `query` and `correction` directly alongside the expected data so now we know what is the query that is being run without needing to add comments or going back to the top of the file.
    
    r? ```@notriddle```
    matthiaskrgr authored Jun 10, 2023
    Configuration menu
    Copy the full SHA
    299929e View commit details
    Browse the repository at this point in the history
  5. Rollup merge of rust-lang#112473 - weihanglo:update-cargo, r=weihanglo

    Update cargo
    
    12 commits in b0fa79679e717cd077b7fc0fa4166f47107f1ba9..49b6d9e179a91cf7645142541c9563443f64bf2b
    2023-06-03 14:19:48 +0000 to 2023-06-09 17:21:19 +0000
    - docs: doc comments for all registry kinds (rust-lang/cargo#12247)
    - chore: Migrate print-ban from test to clippy (rust-lang/cargo#12246)
    - fix: fetch nested git submodules (rust-lang/cargo#12244)
    - refactor: registry source cleanup (rust-lang/cargo#12240)
    - test: loose overly matches for git cli output (rust-lang/cargo#12241)
    - fix: disable multiplexing on macOS for some versions of curl (rust-lang/cargo#12234)
    - docs: doc comments for registry source and index (rust-lang/cargo#12239)
    - doc: point to nightly cargo doc (rust-lang/cargo#12237)
    - Upgrade to `gix` v0.45 for multi-round pack negotiations. (rust-lang/cargo#12236)
    - refactor: git source cleanup (rust-lang/cargo#12197)
    - Add message on reusing previous temporary path on failed cargo installs (rust-lang/cargo#12231)
    - doc: the first line should be a simple sentence instead of a heading (rust-lang/cargo#12228)
    
    r? `@ghost`
    matthiaskrgr authored Jun 10, 2023
    Configuration menu
    Copy the full SHA
    fc9fff6 View commit details
    Browse the repository at this point in the history
  6. Rollup merge of rust-lang#112481 - compiler-errors:new-solver-ignore-…

    …bad-tests, r=lqd
    
    Ignore tests that hang in new solver
    
    This makes it easier to run `--compare-mode=next-solver`, and we can revisit these tests later to find out how to make them less overflowy 😅
    
    r? `@lcnr`
    matthiaskrgr authored Jun 10, 2023
    Configuration menu
    Copy the full SHA
    dcdfff6 View commit details
    Browse the repository at this point in the history