Rollup of 9 pull requests #109284

matthiaskrgr · 2023-03-17T23:05:56Z

Successful merges:

Erase escaping late-bound regions when probing for ambiguous associated types #109102 (Erase escaping late-bound regions when probing for ambiguous associated types)
Fix index out of bounds in suggest_trait_fn_ty_for_impl_fn_infer #109200 (Fix index out of bounds in suggest_trait_fn_ty_for_impl_fn_infer)
E0206 - update description #109211 (E0206 - update description )
Do not ICE for unexpected lifetime with ConstGeneric rib #109222 (Do not ICE for unexpected lifetime with ConstGeneric rib)
fallback to lstat when stat fails on Windows #109235 (fallback to lstat when stat fails on Windows)
Pass the right HIR back from get_fn_decl #109248 (Pass the right HIR back from get_fn_decl)
Suggest surrounding the macro with {} to interpret as a statement #109251 (Suggest surrounding the macro with {} to interpret as a statement)
Check for llvm-tools before install #109256 (Check for llvm-tools before install)
resolve: Improve debug impls for NameBinding #109257 (resolve: Improve debug impls for NameBinding)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

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>

…ed types

…-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.

matthiaskrgr · 2023-03-17T23:06:36Z

@bors r+ rollup=never p=9

bors · 2023-03-17T23:06:38Z

📌 Commit 0d4a56c has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2023-03-18T03:16:35Z

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

bors · 2023-03-18T06:37:04Z

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

rust-timer · 2023-03-18T06:39:35Z

📌 Perf builds for each rolled up PR:

PR#	Perf Build Sha
#109257	786c1c2b144b6125abafca5e9e10fa0d8b9dd2c0
#109256	caa61934a3f8e2bb94929abe45eca7e88f38bcfa
#109251	3ea394281c9f3109881541bac67b1cbe556c96c0
#109248	71661b74df43aa95be75676a90f4c3a12892f573
#109235	f821c2827061f6d3155ad5b2eafcae0e4ef5bfb9
#109222	819aa537ca1c49903c5d7827ee0316d5e2fc2427
#109211	070c18610a149b70b3413e76982f529716d0e3c6
#109200	47380254c43c30c7225f91889ee02fac213230ff
#109102	0195ff084b106ac3cede494cfb3c557659cae841

previous master: 13afbdaa06

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 · 2023-03-18T13:30:26Z

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

compiler-errors and others added 23 commits March 16, 2023 04:02

Fix index out of bounds in suggest_trait_fn_ty_for_impl_fn_infer

60da5de

E0206 - added union to description

dc39bf8

E0206 - removed space

1f12c3e

Do not ICE for unexpected lifetime with ConstGeneric rib

827a990

fallback to lstat when stat fails on Windows

2dbda0a

run rustfmt on changes

0aad0b3

Suggest surrounding the macro with {} to interpret as a statement

550e308

Check for llvm-tools before install

97740a6

resolve: Improve debug impls for NameBinding

2a52080

Print at least the Some/None/Ok/Err status of the nested bindings if not the bindings themselves.

E0206 - code review changes

05dc132

Update compiler/rustc_error_codes/src/error_codes/E0206.md

c4bb47a

Co-authored-by: Waffle Maybe <waffle.lapkin@gmail.com>

Erase escaping late-bound regions when probing for ambiguous associat…

79ad7cc

…ed types

Pass the right HIR back from get_fn_decl

08c9132

Modify code style as per comments

32c589b

Rollup merge of rust-lang#109102 - compiler-errors:ambig-assoc-in-non…

0ee7539

…-lt-binder, r=jackh726 Erase escaping late-bound regions when probing for ambiguous associated types Fixes rust-lang#109090

Rollup merge of rust-lang#109200 - compiler-errors:issue-109191, r=Wa…

55d5cd5

…ffleLapkin Fix index out of bounds in `suggest_trait_fn_ty_for_impl_fn_infer` Fixes rust-lang#109191

Rollup merge of rust-lang#109211 - mili-l:mili_l/update_e0206_descrip…

e7d6369

…tion, r=WaffleLapkin E0206 - update description added `union` to description

Rollup merge of rust-lang#109235 - chaitanyav:master, r=ChrisDenton

2a3c0e3

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

Rollup merge of rust-lang#109251 - MU001999:master, r=Nilstrieb

7e5705e

Suggest surrounding the macro with `{}` to interpret as a statement Fixes rust-lang#109237

Rollup merge of rust-lang#109256 - chaitanyav:fix_108948, r=albertlar…

01edab6

…san68 Check for llvm-tools before install Fixes rust-lang#108948 ````@jpalus```` Please review

Rollup merge of rust-lang#109257 - petrochenkov:bindebug, r=WaffleLapkin

0d4a56c

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.

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 added the merged-by-bors This PR was explicitly merged by bors. label Mar 18, 2023

bors merged commit 85123d2 into rust-lang:master Mar 18, 2023

rustbot added this to the 1.70.0 milestone Mar 18, 2023

bors mentioned this pull request Mar 18, 2023

bootstrap: skip llvm-tools install when externally provided #109196

Closed

matthiaskrgr deleted the rollup-aaublsx branch March 16, 2024 18:18

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 9 pull requests #109284

Rollup of 9 pull requests #109284

matthiaskrgr commented Mar 17, 2023

matthiaskrgr commented Mar 17, 2023

bors commented Mar 17, 2023

bors commented Mar 18, 2023

bors commented Mar 18, 2023

rust-timer commented Mar 18, 2023

rust-timer commented Mar 18, 2023

Rollup of 9 pull requests #109284

Rollup of 9 pull requests #109284

Conversation

matthiaskrgr commented Mar 17, 2023

matthiaskrgr commented Mar 17, 2023

bors commented Mar 17, 2023

bors commented Mar 18, 2023

bors commented Mar 18, 2023

rust-timer commented Mar 18, 2023

rust-timer commented Mar 18, 2023

Overall result: ❌ regressions - no action needed

Instruction count

Max RSS (memory usage)

Cycles