Skip to content

Rollup of 9 pull requests #109284

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 23 commits into from
Mar 18, 2023
Merged

Rollup of 9 pull requests #109284

merged 23 commits into from
Mar 18, 2023

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

compiler-errors and others added 23 commits March 16, 2023 04:02
Print at least the Some/None/Ok/Err status of the nested bindings if not the bindings themselves.
Co-authored-by: Waffle Maybe <waffle.lapkin@gmail.com>
…-lt-binder, r=jackh726

Erase escaping late-bound regions when probing for ambiguous associated types

Fixes rust-lang#109090
…ffleLapkin

Fix index out of bounds in `suggest_trait_fn_ty_for_impl_fn_infer`

Fixes rust-lang#109191
…tion, r=WaffleLapkin

E0206 - update description

added `union` to description
…trochenkov

Do not ICE for unexpected lifetime with ConstGeneric rib

Fixes rust-lang#109143
r? ````@petrochenkov````

Combining this test with the previous test will affect the previous diagnostics, so I added a separate test case.
fallback to lstat when stat fails on Windows

Fixes rust-lang#109106
````@ChrisDenton```` please let me know if this is the expected behavior for stat on windows
…=WaffleLapkin

Pass the right HIR back from `get_fn_decl`

Fixes rust-lang#109232

Makes sure that the `fn_id: HirId` that we pass to `suggest_missing_return_type` matches up with the `fn_decl: hir::FnDecl` that we pass to it, so the late-bound vars that we fetch from the former match up with the types in the latter...

This HIR suggestion code really needs a big refactor. I've tried to do it in the past (a couple of attempts), but it's a super tangled mess. It really shouldn't be passing around things like `hir::Node` and just deal with `LocalDefId`s everywhere... Anyways, I'd rather fix this ICE, now.
Suggest surrounding the macro with `{}` to interpret as a statement

Fixes rust-lang#109237
…san68

Check for llvm-tools before install

Fixes rust-lang#108948
````@jpalus```` Please review
resolve: Improve debug impls for `NameBinding`

Print at least the Some/None/Ok/Err status of the nested bindings if not the bindings themselves.
Noticed while reviewing rust-lang#108729.
@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. T-libs Relevant to the library team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Mar 17, 2023
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=9

@bors
Copy link
Collaborator

bors commented Mar 17, 2023

📌 Commit 0d4a56c has been approved by matthiaskrgr

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 Mar 17, 2023
@bors
Copy link
Collaborator

bors commented Mar 18, 2023

⌛ Testing commit 0d4a56c with merge 85123d2...

@bors
Copy link
Collaborator

bors commented Mar 18, 2023

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 85123d2 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 18, 2023
@bors bors merged commit 85123d2 into rust-lang:master Mar 18, 2023
@rustbot rustbot added this to the 1.70.0 milestone Mar 18, 2023
@rust-timer
Copy link
Collaborator

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (85123d2): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
0.5% [0.5%, 0.5%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 0.5% [0.5%, 0.5%] 1

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)
1.5% [0.9%, 2.2%] 2
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-1.8% [-1.8%, -1.8%] 1
Improvements ✅
(secondary)
-2.5% [-2.5%, -2.5%] 1
All ❌✅ (primary) 0.4% [-1.8%, 2.2%] 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)
- - 0
Improvements ✅
(primary)
-0.5% [-0.7%, -0.4%] 2
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -0.5% [-0.7%, -0.4%] 2

@matthiaskrgr matthiaskrgr deleted the rollup-aaublsx branch March 16, 2024 18:18
# 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. T-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants