Rollup of 7 pull requests #136658

matthiaskrgr · 2025-02-06T20:56:29Z

Successful merges:

disallow repr() on invalid items #133925 (disallow repr() on invalid items)
Simplify slice indexing in next trait solver #136069 (Simplify slice indexing in next trait solver)
Stabilize map_many_mut feature #136152 (Stabilize map_many_mut feature)
Misc. rustc_hir cleanups 🧹 #136219 (Misc. rustc_hir cleanups 🧹)
Couple of changes to run rustc in miri #136580 (Couple of changes to run rustc in miri)
Couple of minor cleanups to the diagnostic infrastructure #136636 (Couple of minor cleanups to the diagnostic infrastructure)
Clippy subtree update #136645 (Clippy subtree update)

r? @ghost
@rustbot modify labels: rollup

Also this generates an error when `repr` is used on a trait method and the `fn_align` feature is not enabled. Looks like that was missed here: https://github.com/rust-lang/rust/pull/110313/files Which first enables the align attribute on trait methods.

Counting in bytes for a pointer to `u8` is legitimate and must not trigger the lint. Also, this prevents linting the `{std,core}::ptr::write_bytes` as it manipulates bytes.

as well as `HashMap::get_many_unchecked_mut` to `HashMap::get_disjoint_unchecked_mut`.

…ubtree-update

changelog: [`needless_option_take`]: add autofix

…estion (rust-lang#13990) fix rust-lang#13959 The current implementation of the `write_literal` and `print_literal` lint performs escaping for the second argument of `write!` ,`writeln!`, `print!` and `println!` of the suggestion by first replacing `"` with `\"`, and then replacing `\` with `\\`. Performing these replacements in this order may lead to unnecessary backslashes being added if the original code contains `"` (e.g. `"` -> `\\"`), potentially resulting in a suggestion that causes the code to fail to compile. In the issue mentioned above, it’s suggested to use raw strings as raw strings, but implementing this would require an ad-hoc change to the current implementation, so it has been deferred. (I'll implement this in another PR) changelog: [`write_literal`]: fix incorrect escaping of suggestions changelog: [`print_literal`]: fix incorrect escaping of suggestions

…#13894) Closes rust-lang#11434 by moving `format_push_string` and `format_collect` to pedantic. changelog: Move `format_push_string` and `format_collect` to pedantic

…d-in-new-solver, r=lcnr Do not consider child bound assumptions for rigid alias r? lcnr See first commit for the important details. For second commit, I also stacked a somewhat opinionated name change, though I can separate that if needed. Fixes rust-lang/trait-system-refactor-initiative#149

Refactor FnKind variant to hold &Fn Pulling the change suggested in rust-lang#128045 to reduce the impact of changing `Fn` item. r? `@oli-obk`

Removing the semicolon of the last statement of an expressionless block may change the block type even if the statement's type is `()`. If the block type is `!` because of a systematic early return, typing it as `()` may make it incompatible with the expected type for the block (to which `!` is cast).

Couple of changes to run rustc in miri This is not the full set of patches required to run rustc in miri, but it is the fast majority of the changes to rustc itself. There is also a change to the jobserver crate necessary and on arm64 a change to the memchr crate. Running rustc in miri has already found some UB: rust-lang#136579 cc rust-lang#135870 (comment)

…rrors Couple of minor cleanups to the diagnostic infrastructure

…Manishearth Clippy subtree update r? `@Manishearth`

matthiaskrgr · 2025-02-06T20:56:45Z

@bors r+ rollup=never p=6

bors · 2025-02-06T20:56:48Z

📌 Commit b1be2d5 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2025-02-07T00:10:07Z

⌛ Testing commit b1be2d5 with merge cd6e566...

…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#133925 (disallow `repr()` on invalid items) - rust-lang#136069 (Simplify slice indexing in next trait solver) - rust-lang#136152 (Stabilize `map_many_mut` feature) - rust-lang#136219 (Misc. `rustc_hir` cleanups 🧹) - rust-lang#136580 (Couple of changes to run rustc in miri) - rust-lang#136636 (Couple of minor cleanups to the diagnostic infrastructure) - rust-lang#136645 (Clippy subtree update) r? `@ghost` `@rustbot` modify labels: rollup

rust-log-analyzer · 2025-02-07T01:36:16Z

The job aarch64-gnu-debug failed! Check out the build log: (web) (plain)

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

bors · 2025-02-07T01:36:57Z

💔 Test failed - checks-actions

matthiaskrgr · 2025-02-07T01:58:44Z

@bors retry npm segv

bors · 2025-02-07T03:36:42Z

⌛ Testing commit b1be2d5 with merge f37c19062c7e7dceff77eca8f70fb222e4d36590...

bors · 2025-02-07T06:25:35Z

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

rust-timer · 2025-02-07T06:29:34Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#128045	#[contracts::requires(...)] + #[contracts::ensures(...)]	❌ conflicts merging '0a8331f681' into previous master ❌
#130514	Implement MIR lowering for unsafe binders	❌ conflicts merging 'a9434c08e2' into previous master ❌
#133925	disallow `repr()` on invalid items	`a421dce72308b7d5bc0be8df8487d9992fe84a9e` (link)
#135902	Do not consider child bound assumptions for rigid alias	❌ conflicts merging 'abb3e8e781' into previous master ❌
#136069	Simplify slice indexing in next trait solver	`2c580a782897cf09e627001c41baf69c56ff0495` (link)
#136152	Stabilize `map_many_mut` feature	`33cc74812a10552ca672dfe5d1b05720349651bd` (link)
#136164	Refactor FnKind variant to hold &Fn	❌ conflicts merging 'd7874f436a' into previous master ❌
#136219	Misc. `rustc_hir` cleanups 🧹	`87fc4d92517c1a8ca81f17a6d16fc21830357518` (link)
#136279	Rename `tcx.ensure()` to `tcx.ensure_ok()`, and improve the…	❌ conflicts merging '64fcb00308' into previous master ❌
#136422	Convert two `rustc_middle::lint` functions to `Span` method…	❌ conflicts merging 'd30f045fce' into previous master ❌
#136445	Couple of cleanups to DiagCtxt and EarlyDiagCtxt	❌ conflicts merging 'abdee777c2' into previous master ❌
#136580	Couple of changes to run rustc in miri	`3f447fbcce8194d70c1fb6999080fc4c60967154` (link)
#136636	Couple of minor cleanups to the diagnostic infrastructure	`4cdf2e3056e362204b5e18e0b19511faf6182b94` (link)
#136645	Clippy subtree update	`c795070bdd043bf33c588f1a6e4bae9f78b34169` (link)

previous master: 942db6782f

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 · 2025-02-07T07:43:06Z

Finished benchmarking commit (f37c190): 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 (primary -1.7%, secondary -3.2%)

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.7%	[0.7%, 0.7%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-2.9%	[-5.3%, -0.5%]	2
Improvements ✅ (secondary)	-3.2%	[-4.4%, -1.3%]	5
All ❌✅ (primary)	-1.7%	[-5.3%, 0.7%]	3

Cycles

Results (secondary 2.1%)

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.1%	[2.1%, 2.1%]	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: 780.473s -> 779.478s (-0.13%)
Artifact size: 329.02 MiB -> 329.05 MiB (0.01%)

folkertdev and others added 30 commits December 5, 2024 16:44

disallow repr() on invalid items

dfd76c1

Also this generates an error when `repr` is used on a trait method and the `fn_align` feature is not enabled. Looks like that was missed here: https://github.com/rust-lang/rust/pull/110313/files Which first enables the align attribute on trait methods.

fix issue 132391

a4bb0d4

Move format_push_string and format_collect to pedantic

a7adb82

fix escaping problem in write_literal and print_literal lint

65b95a2

Address review comments

87f7e21

Do not trigger [size_of_in_element_count] for u8

bbd58d1

Counting in bytes for a pointer to `u8` is legitimate and must not trigger the lint. Also, this prevents linting the `{std,core}::ptr::write_bytes` as it manipulates bytes.

Update version for unneeded_struct_pattern

5bd989a

auto-fix for redundant_else lint

7aae4f4

needless_option_take: add autofix

f0b99b2

Simplify slice indexing in next trait solver

e485cc5

new manual_option_as_slice lint

13be95a

Stabilize HashMap::get_many_mut as HashMap::get_disjoint_mut

885278b

as well as `HashMap::get_many_unchecked_mut` to `HashMap::get_disjoint_unchecked_mut`.

Adjust compiler for HashMap::get_many_mut stabilization

6b7b547

Merge commit '51d49c1ae2785b24ef18a46ef233fc1d91844666' into clippy-s…

9da9ddb

…ubtree-update

needless_option_take: add autofix (rust-lang#14042)

9ede32f

changelog: [`needless_option_take`]: add autofix

Make item self/non-self bound naming less whack

abb3e8e

Refactor FnKind variant to hold &Fn

d7874f4

Move format_push_string and format_collect to pedantic (rust-lang…

e02c885

…#13894) Closes rust-lang#11434 by moving `format_push_string` and `format_collect` to pedantic. changelog: Move `format_push_string` and `format_collect` to pedantic

rustc_hir: replace is_empty()+indexing with first()

0baa100

rustc_hir: use box patterns to flatten some nested pattern matches

3802225

rustc_hir: don't open-code Iterator::eq

1d4a419

rustc_hir: fix typo in comment

8aba730

rustc_hir: flatten nested ifs

6c1df36

rustc_hir: remove some uneeded refs and derefs

056fe96

Rollup merge of rust-lang#136164 - celinval:chores-fnkind, r=oli-obk

a4eff9d

Refactor FnKind variant to hold &Fn Pulling the change suggested in rust-lang#128045 to reduce the impact of changing `Fn` item. r? `@oli-obk`

Eliminate PatKind::Path

7eefa76

Add new lint return_and_then

84fb6b1

matthiaskrgr added 3 commits February 6, 2025 21:56

Rollup merge of rust-lang#136636 - bjorn3:error_cleanup, r=compiler-e…

79e5424

…rrors Couple of minor cleanups to the diagnostic infrastructure

Rollup merge of rust-lang#136645 - flip1995:clippy-subtree-update, r=…

b1be2d5

…Manishearth Clippy subtree update r? `@Manishearth`

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 Feb 6, 2025

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 Feb 7, 2025

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 Feb 7, 2025

bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 7, 2025

bors merged commit f37c190 into rust-lang:master Feb 7, 2025
7 checks passed

rustbot added this to the 1.86.0 milestone Feb 7, 2025

bors mentioned this pull request Feb 7, 2025

Make empty-line-after an early clippy lint #136657

Open

klensy mentioned this pull request Feb 7, 2025

rolled up builds: conflicts merging 'xxx' into previous master rust-lang/rustc-perf#2037

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 7 pull requests #136658

Rollup of 7 pull requests #136658

matthiaskrgr commented Feb 6, 2025

matthiaskrgr commented Feb 6, 2025

bors commented Feb 6, 2025

bors commented Feb 7, 2025

rust-log-analyzer commented Feb 7, 2025

bors commented Feb 7, 2025

matthiaskrgr commented Feb 7, 2025

bors commented Feb 7, 2025

bors commented Feb 7, 2025

rust-timer commented Feb 7, 2025

rust-timer commented Feb 7, 2025

Rollup of 7 pull requests #136658

Rollup of 7 pull requests #136658

Conversation

matthiaskrgr commented Feb 6, 2025

matthiaskrgr commented Feb 6, 2025

bors commented Feb 6, 2025

bors commented Feb 7, 2025

rust-log-analyzer commented Feb 7, 2025

bors commented Feb 7, 2025

matthiaskrgr commented Feb 7, 2025

bors commented Feb 7, 2025

bors commented Feb 7, 2025

rust-timer commented Feb 7, 2025

rust-timer commented Feb 7, 2025

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size