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 9 pull requests #118277

Merged
merged 22 commits into from
Nov 25, 2023
Merged

Rollup of 9 pull requests #118277

merged 22 commits into from
Nov 25, 2023

Conversation

fmease
Copy link
Member

@fmease fmease commented Nov 25, 2023

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

dtolnay and others added 22 commits November 24, 2023 09:14
Signed-off-by: onur-ozkan <work@onurozkan.dev>
This fixes the problem of not being able to see bootstrap config
changes unless the change-id in config.toml changes.

Signed-off-by: onur-ozkan <work@onurozkan.dev>
Because bootstrap lib is already large and complicated, this should
make the "bumping change-id" process easier.

Signed-off-by: onur-ozkan <work@onurozkan.dev>
This file was getting too big and causing a lot of merge conflicts. All
these changes shouldn't be visible to users since this module is private.
Separate items that are exposed in the `stable_mir` crate to be used
by the compiler from items that we expect to be used by tool developers.
…acrum

general improvements/fixes on bootstrap

- adds rust-lang#117813 into change tracker rust-lang@6d9b92f
- fixes a bug in change tracker rust-lang@63a4410
- relocates `CONFIG_CHANGE_HISTORY` rust-lang@a7dcb98
…, r=GuillaumeGomez

rustdoc-search: avoid infinite where clause unbox

Fixes rust-lang#118242
Replace `option.map(cond) == Some(true)` with `option.is_some_and(cond)`

Requested by `@fmease` in rust-lang#118226 (review).

There is also a much larger number of `option.map_or(false, cond)` that can be changed separately if someone wants.

r? fmease
…rk-Simulacrum

Request that rust-analyzer changes are sent upstream first if possible

This automates `@lnicola's` comment rust-lang#118253 (comment).

Rustbot will write a comment similar to rust-lang#116743 (comment).
…infer, r=compiler-errors

Move EagerResolution to rustc_infer::infer::resolve

`EagerResolver` fits better in `rustc_infer::infer::resolver`.

Started to disentagle rust-lang#118118 that has a lot of unrelated things.

r? `@compiler-errors` `@lcnr`
…=compiler-errors

Relate Inherent Associated Types using eq

We should call `eq` instead of `sup` as we're relating `Ty` directly and not `Binder<TraitRef>`.

This is part of rust-lang#118118 but unrelated to that PR.

r? `@compiler-errors` `@lcnr`
…ler-errors

Move stuff around on `stable_mir` and `rustc_smir` crate

1. Break down rustc_smir/mod.rs file.
    - This file was getting too big and causing a lot of merge conflicts.
      All these changes shouldn't be visible to users since this module is private.
2.  Move the compiler interface defs to its own module
    - Separate items that are exposed in the `stable_mir` crate to be used
      by the compiler from items that we expect to be used by tool developers.
Separate `NaN`/`Inf` floats with `_`

r? RalfJung

Fixes rust-lang#118221

No test 🤷 unless you know a good way to print an `ImmTy` in a unit test?
Fix smir's `Ty::Ref` pretty printing

Add `&` or `&mut` to reference when generating a string for `TyKind::Ref`.

r? `@ouz-a`
@rustbot rustbot added A-meta Area: Issues about the rust-lang/rust repository. A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative rollup A PR which is a rollup labels Nov 25, 2023
@fmease
Copy link
Member Author

fmease commented Nov 25, 2023

@bors r+ rollup=never p=9

@bors
Copy link
Contributor

bors commented Nov 25, 2023

📌 Commit 20d243e has been approved by fmease

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 25, 2023
@bors
Copy link
Contributor

bors commented Nov 25, 2023

⌛ Testing commit 20d243e with merge 3668a8a...

@bors
Copy link
Contributor

bors commented Nov 25, 2023

☀️ Test successful - checks-actions
Approved by: fmease
Pushing 3668a8a to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 25, 2023
@bors bors merged commit 3668a8a into rust-lang:master Nov 25, 2023
12 checks passed
@rustbot rustbot added this to the 1.76.0 milestone Nov 25, 2023
@fmease fmease deleted the rollup-itucldm branch November 25, 2023 13:07
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#118220 general improvements/fixes on bootstrap 8dcb7d876c753d7b0f3f74857fda7186b26528db (link)
#118251 rustdoc-search: avoid infinite where clause unbox 75c5ae661ac4e8b52601d92ccf960b958ccdd954 (link)
#118253 Replace option.map(cond) == Some(true) with `option.is_so… 76c187a355a4481f7dced7c2933b76ebd4e79ffe (link)
#118255 Request that rust-analyzer changes are sent upstream first … f7186989b0d2ca95d9939f4a253944bef78e61ba (link)
#118259 Move EagerResolution to rustc_infer::infer::resolve d834947bb0e1f0582a204038406d535bca4a51d4 (link)
#118262 Relate Inherent Associated Types using eq d6f5552c7a4e007c0f57f840f605974d0d805a87 (link)
#118266 Move stuff around on stable_mir and rustc_smir crate e6ee76d977946e0598295ff3e269837d66d6de1e (link)
#118271 Separate NaN/Inf floats with _ 3bff74d9fcd9ca91ca1feb30ed3296bd22cb7063 (link)
#118274 Fix smir's Ty::Ref pretty printing b8c5875f0fb2a0d12f03e666ef440b55056e6392 (link)

previous master: fad6bb80fa

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (3668a8a): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
3.0% [2.2%, 3.8%] 2
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-2.5% [-3.9%, -1.1%] 2
All ❌✅ (primary) - - 0

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 674.747s -> 675.41s (0.10%)
Artifact size: 313.31 MiB -> 313.30 MiB (-0.00%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-meta Area: Issues about the rust-lang/rust repository. A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants