Rollup of 8 pull requests #122041

matthiaskrgr · 2024-03-05T18:53:23Z

Successful merges:

Limit the number of names and values in check-cfg diagnostics #121202 (Limit the number of names and values in check-cfg diagnostics)
errors: share SilentEmitter between rustc and rustfmt #121301 (errors: share SilentEmitter between rustc and rustfmt)
Hint user to update nightly on ICEs produced from outdated nightly #121658 (Hint user to update nightly on ICEs produced from outdated nightly)
only compare ambiguity item that have hard error #121846 (only compare ambiguity item that have hard error)
add test for #78894 #71450 #121961 (add test for Incorrect unused_import lint firing for a function-local macro_rules! #78894 False positive unused_import warning on std::string::String #71450)
hir_analysis: enums return None in find_field #121975 (hir_analysis: enums return None in find_field)
Fix duplicated path in the "not found dylib" error #121978 (Fix duplicated path in the "not found dylib" error)
Merge impl_trait_in_assoc_types_defined_by query back into opaque_types_defined_by #121991 (Merge impl_trait_in_assoc_types_defined_by query back into opaque_types_defined_by)

r? @ghost
@rustbot modify labels: rollup

Unnamed union fields with enums are checked for, but if `find_field` causes an ICE then the compiler won't get to that point. Signed-off-by: David Wood <david@davidtw.co>

Signed-off-by: David Wood <david@davidtw.co>

…types_defined_by` Instead, when we're collecting opaques for associated items, we choose the right collection mode depending on whether we're collecting for an associated item of a trait impl or not.

… r=pnkfelix Limit the number of names and values in check-cfg diagnostics The Rust for Linux [feedback](rust-lang#82450 (comment)) to the check-cfg Call for Testing, revealed a weakness in the check-cfg. They are unbounded and in the case RfL they have ~20k cfgs and having them printed (even once) is unbearable. This PR limits it to 35 (28 rustc well known + `feature` + `docsrs` + 5 custom) which feels like a good middle ground for regular users (i.e. Cargo users). When it goes over that limit print the N first with " and X more". ``@rustbot`` label +F-check-cfg

…r=pnkfelix errors: share `SilentEmitter` between rustc and rustfmt Fixes rust-lang/rustfmt#6082. Shares the `SilentEmitter` between rustc and rustfmt, and gives it a fallback bundle (since it can emit diagnostics in some contexts).

…li-obk Hint user to update nightly on ICEs produced from outdated nightly This is a conservative best-effort approach to detect a potentially outdated nightly; it will fallback to the regular ICE-reporting if any of the following cases are true: - Channel is not nightly - Version information is not available - Version date is not parseable as a YYYY-MM-DD or is missing - System time is at least 36 hours ahead of the user's nightly release datetime. - Any internal features are used. Note that I'm not sure how to make a test for this: I tested this manually by `CFG_VER_DATE="2020-02-02" ./x build library --stage 1`, and also changing the channel detection in `rustc_driver_impl` from `Some("nightly")` to `Some("nightly" | "dev")`, and then running `rustc +stage1 test.rs -Ztreat-err-as-bug=1` with a non-existent `test.rs`. <img width="1145" alt="Screenshot 2024-02-27 at 01 12 28" src="https://github.com/rust-lang/rust/assets/39484203/eff6af2e-4b19-4a70-af57-cd739ecf0e84"> Closes rust-lang#118832.

only compare ambiguity item that have hard error Fixes rust-lang#121760 An easy fix, r? ``@petrochenkov``

…ochenkov add test for rust-lang#78894 rust-lang#71450 fixes rust-lang#78894 fixes rust-lang#71450

…nkov hir_analysis: enums return `None` in `find_field` Fixes rust-lang#121757. Unnamed union fields with enums are checked for, but if `find_field` causes an ICE then the compiler won't get to that point.

…th, r=bjorn3 Fix duplicated path in the "not found dylib" error While working on the gcc backend, I couldn't figure out why I had this error: ``` error: couldn't load codegen backend /checkout/compiler/rustc_codegen_gcc/target/release/librustc_codegen_gcc.so/checkout/compiler/rustc_codegen_gcc/target/release/librustc_codegen_gcc.so: cannot open shared object file: No such file or directory ``` As you can see, the path is duplicated for some reason. After investigating a bit more, I realized that `libloading::Error::LoadLibraryExW` starts with the path of the not found dylib, making it appear twice in our error afterward (because we do render it like this: `{path}{err}`, and since the `err` starts with the path...). Thanks to `````@bjorn3````` for linking me to rust-lang#121392. :)

…_by_queries, r=compiler-errors Merge impl_trait_in_assoc_types_defined_by query back into `opaque_types_defined_by` Instead, when we're collecting opaques for associated items, we choose the right collection mode depending on whether we're collecting for an associated item of a trait impl or not. r? ```@compiler-errors``` follow up to rust-lang#121838

matthiaskrgr · 2024-03-05T18:53:35Z

@bors r+ rollup=never p=8

bors · 2024-03-05T18:53:37Z

📌 Commit 3d6b3d0 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2024-03-05T21:07:17Z

⌛ Testing commit 3d6b3d0 with merge 4cb986b...

…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#121202 (Limit the number of names and values in check-cfg diagnostics) - rust-lang#121301 (errors: share `SilentEmitter` between rustc and rustfmt) - rust-lang#121658 (Hint user to update nightly on ICEs produced from outdated nightly) - rust-lang#121846 (only compare ambiguity item that have hard error) - rust-lang#121961 (add test for rust-lang#78894 rust-lang#71450) - rust-lang#121975 (hir_analysis: enums return `None` in `find_field`) - rust-lang#121978 (Fix duplicated path in the "not found dylib" error) - rust-lang#121991 (Merge impl_trait_in_assoc_types_defined_by query back into `opaque_types_defined_by`) r? `@ghost` `@rustbot` modify labels: rollup

bors · 2024-03-05T21:09:53Z

💔 Test failed - checks-actions

rust-log-analyzer · 2024-03-05T21:10:42Z

A job failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

2
Image input checksum 6f73101dbc71b7bba1416667b60e27033203b66c3abbf47fa89b1659c794d7e8fbb4d01654d16472cae0513f8826be864bed00ef7d26541c51c968fbaee8869c
##[group]Building docker image for test-various
Docker version 24.0.9, build 2936816
Error response from daemon: Get "https://ghcr.io/v2/": Get "https://ghcr.io/token?account=rust-lang-ci&client_id=docker&offline_token=true&service=ghcr.io": net/http: request canceled while waiting for connection (Client.Timeout exceeded while awaiting headers)
##[error]Process completed with exit code 1.

matthiaskrgr · 2024-03-05T21:11:20Z

Error response from daemon: Get "https://ghcr.io/v2/": Get "https://ghcr.io/token?account=rust-lang-ci&client_id=docker&offline_token=true&service=ghcr.io": net/http: request canceled while waiting for connection (Client.Timeout exceeded while awaiting headers)

dafuq
@bors retry

bors · 2024-03-06T00:03:52Z

⌛ Testing commit 3d6b3d0 with merge 62415e2...

bors · 2024-03-06T02:17:17Z

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 62415e2 to master...

rust-timer · 2024-03-06T02:19:30Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#121202	Limit the number of names and values in check-cfg diagnosti…	`c10b66b42bf7112e673bef0db6d35ae84278d4ee` (link)
#121301	errors: share `SilentEmitter` between rustc and rustfmt	`519e50ebec3c79cf3c624c88100faa088eb2e906` (link)
#121658	Hint user to update nightly on ICEs produced from outdated …	`ad4897a86e8f9c815dd66c0e43437caf7a5047d0` (link)
#121846	only compare ambiguity item that have hard error	`c7e73eee640d98224e255b50191fb3359467ddf0` (link)
#121961	add test for #78894 #71450	`02cd13813e7709e97101453e61930aee776c75bc` (link)
#121975	hir_analysis: enums return `None` in `find_field`	`9d875667853f2a2aca30ae047eb7225536de302d` (link)
#121978	Fix duplicated path in the "not found dylib" error	`6ed40a730911394f3d87871984c030909064b2e8` (link)
#121991	Merge impl_trait_in_assoc_types_defined_by query back into …	`2ff591cc42ce7e3814cd34cb081e4aad7bbd690a` (link)

previous master: b6d2d841bc

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 · 2024-03-06T03:32:21Z

Finished benchmarking commit (62415e2): comparison URL.

Overall result: ✅ improvements - 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
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-1.3%	[-1.3%, -1.3%]	1
All ❌✅ (primary)	-	-	0

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)	3.2%	[3.2%, 3.2%]	1
Regressions ❌ (secondary)	2.2%	[2.2%, 2.2%]	1
Improvements ✅ (primary)	-2.1%	[-2.6%, -1.6%]	2
Improvements ✅ (secondary)	-2.6%	[-2.7%, -2.5%]	2
All ❌✅ (primary)	-0.3%	[-2.6%, 3.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)	2.3%	[2.3%, 2.3%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

Binary size

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

Bootstrap: 646.18s -> 645.485s (-0.11%)
Artifact size: 175.03 MiB -> 175.07 MiB (0.02%)

jieyouxu and others added 20 commits February 27, 2024 01:13

Hint user to update nightly on ICEs produced from outdated nightly

a5245ef

Don't suggest update nightly if using internal features

a0ca9b1

Adjust wording

9c963fc

only compare ambiguity item that have hard error

89954e5

add test for rust-lang#78894

6e9f59f

hir_analysis: enums return None in find_field

4e03c51

Unnamed union fields with enums are checked for, but if `find_field` causes an ICE then the compiler won't get to that point. Signed-off-by: David Wood <david@davidtw.co>

Fix duplicated path in the "not found dylib" error

640e99c

Add regression ui test for duplicated path in dylib error

5e6e140

add test for rust-lang#71450

523ab25

Limit the number of names and values in check-cfg diagnostics

9d9b26b

errors: share SilentEmitter between rustc and rustfmt

2ee0409

Signed-off-by: David Wood <david@davidtw.co>

Merge impl_trait_in_assoc_types_defined_by query back into `opaque_…

da35734

…types_defined_by` Instead, when we're collecting opaques for associated items, we choose the right collection mode depending on whether we're collecting for an associated item of a trait impl or not.

Rollup merge of rust-lang#121846 - bvanjoi:fix-121760, r=petrochenkov

152b690

only compare ambiguity item that have hard error Fixes rust-lang#121760 An easy fix, r? ``@petrochenkov``

Rollup merge of rust-lang#121961 - surechen:add_test_20240304, r=petr…

5cdf870

…ochenkov add test for rust-lang#78894 rust-lang#71450 fixes rust-lang#78894 fixes rust-lang#71450

Rollup merge of rust-lang#121975 - davidtwco:issue-121757, r=petroche…

f560806

…nkov hir_analysis: enums return `None` in `find_field` Fixes rust-lang#121757. Unnamed union fields with enums are checked for, but if `find_field` causes an ICE then the compiler won't get to that point.

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Mar 5, 2024

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 5, 2024

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 5, 2024

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 5, 2024

bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 6, 2024

bors merged commit 62415e2 into rust-lang:master Mar 6, 2024
12 checks passed

rustbot added this to the 1.78.0 milestone Mar 6, 2024

This was referenced Mar 6, 2024

Lower struct patterns and struct expressions with unnamed fields #121553

Closed

Split an item bounds and an item's super predicates #121123

Merged

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 8 pull requests #122041

Rollup of 8 pull requests #122041

matthiaskrgr commented Mar 5, 2024

matthiaskrgr commented Mar 5, 2024

bors commented Mar 5, 2024

bors commented Mar 5, 2024

bors commented Mar 5, 2024

rust-log-analyzer commented Mar 5, 2024

matthiaskrgr commented Mar 5, 2024

bors commented Mar 6, 2024

bors commented Mar 6, 2024

rust-timer commented Mar 6, 2024

rust-timer commented Mar 6, 2024

Rollup of 8 pull requests #122041

Rollup of 8 pull requests #122041

Conversation

matthiaskrgr commented Mar 5, 2024

matthiaskrgr commented Mar 5, 2024

bors commented Mar 5, 2024

bors commented Mar 5, 2024

bors commented Mar 5, 2024

rust-log-analyzer commented Mar 5, 2024

matthiaskrgr commented Mar 5, 2024

bors commented Mar 6, 2024

bors commented Mar 6, 2024

rust-timer commented Mar 6, 2024

rust-timer commented Mar 6, 2024

Overall result: ✅ improvements - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size