Skip to content

Rollup of 7 pull requests #111342

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 17 commits into from
May 8, 2023
Merged

Rollup of 7 pull requests #111342

merged 17 commits into from
May 8, 2023

Conversation

Dylan-DPC
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

compiler-errors and others added 17 commits April 25, 2023 20:41
also add a suggestion for boxing empty blocks.
… r=BoxyUwU

Make `(try_)subst_and_normalize_erasing_regions` take `EarlyBinder`

Changes `subst_and_normalize_erasing_regions` and `try_subst_and_normalize_erasing_regions` to take  `EarlyBinder<T>` instead of `T`.

(related to rust-lang#105779)

This was suggested by `@BoxyUwU` in rust-lang#107753 (comment). After changing `type_of` to return `EarlyBinder`, there were several places where the binder was immediately skipped to call `tcx.subst_and_normalize_erasing_regions`, only for the binder to be reconstructed inside of that method.

r? `@BoxyUwU`
…wup, r=cjgillot

Fix lifetime suggestion for type aliases with objects in them

Fixes an issue identified in rust-lang#110761 (comment)

This suggestion, like many other borrowck suggestions, are very fragile and there are other ways to trigger strange behavior even after this PR, so this is just a small improvement and not a total rework 💀
…iler-errors

Use smaller ints for bitflags

Free shrinking!
…=compiler-errors

Fix some suggestions where a `Box<T>` is expected.

This fixes rust-lang#111011, and also adds a suggestion for boxing a unit type when a `Box<T>` was expected and an empty block was found.
… r=cjgillot

Further normalize msvc-non-utf8-ouput

Fixes rust-lang#111256 by normalizing this tests down to the essential part so that it only tests for the Unicode output we expect. Also uses a file name that should never occur outside of this test.
…ompiler-errors

Make generics_of has_self on RPITITs delegate to the opaque

r? `@compiler-errors`

I couldn't come up with a test case and none of the ones in the `tests` folder is impacted by this change, but I still think is the right thing to do.

Michael, let me know if you have ideas on how to add a test that's affected by this change.
@rustbot rustbot added 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. rollup A PR which is a rollup labels May 8, 2023
@Dylan-DPC
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented May 8, 2023

📌 Commit 172ddcc has been approved by Dylan-DPC

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 May 8, 2023
@bors
Copy link
Collaborator

bors commented May 8, 2023

⌛ Testing commit 172ddcc with merge c86e7fb...

@bors
Copy link
Collaborator

bors commented May 8, 2023

☀️ Test successful - checks-actions
Approved by: Dylan-DPC
Pushing c86e7fb to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 8, 2023
@bors bors merged commit c86e7fb into rust-lang:master May 8, 2023
@rustbot rustbot added this to the 1.71.0 milestone May 8, 2023
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Perf Build Sha
#111323 8dfe31f1ff0b1eeadb6f0280eb1cb009e43e5ce2
#111265 4cab099a4968b5e3decf060b9212145e71fc53a2
#111262 48aebc31a50bc76324c4452379df6fcd11fd42ca
#111056 e2e830222bc0bf758cd4af20556017465ce127e3
#111022 b5a3f1a255c3cac248e2a970894c6db30782c3d0
#110827 584bf1610197e3c68eaae509e18ec1d6eff586b9
#110297 4066e496508c2a34465393c06e44f164ed3f7b85

previous master: ea0c22ea4f

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 (c86e7fb): 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)
2.4% [2.4%, 2.5%] 2
Regressions ❌
(secondary)
2.7% [2.7%, 2.7%] 1
Improvements ✅
(primary)
-4.5% [-4.5%, -4.5%] 1
Improvements ✅
(secondary)
-2.2% [-2.2%, -2.2%] 1
All ❌✅ (primary) 0.1% [-4.5%, 2.5%] 3

Cycles

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)
1.7% [1.7%, 1.7%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Binary size

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.0% [0.0%, 0.1%] 46
Regressions ❌
(secondary)
0.0% [0.0%, 0.1%] 27
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 0.0% [0.0%, 0.1%] 46

Bootstrap: 654.179s -> 654.499s (0.05%)

@Dylan-DPC Dylan-DPC deleted the rollup-b5p6wzy branch May 9, 2023 06:00
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.