Rollup of 7 pull requests #136225

fmease · 2025-01-29T02:12:22Z

Successful merges:

[cfg_match] Document the use of expressions. #135625 ([cfg_match] Document the use of expressions.)
Do not consider child bound assumptions for rigid alias #135902 (Do not consider child bound assumptions for rigid alias)
Rename Piece::String to Piece::Lit #135943 (Rename Piece::String to Piece::Lit)
Add mermaid graphs of NLL regions and SCCs to polonius MIR dump #136104 (Add mermaid graphs of NLL regions and SCCs to polonius MIR dump)
Update books #136143 (Update books)
ABI-required target features: warn when they are missing in base CPU #136147 (ABI-required target features: warn when they are missing in base CPU)
Refactor FnKind variant to hold &Fn #136164 (Refactor FnKind variant to hold &Fn)

r? @ghost
@rustbot modify labels: rollup

- invert pre/code which was an invalid combination, that works fine in practice - remove unneeded code wrapper for graphs

…(rather than silently enabling them)

…tgross35,jhpratt [cfg_match] Document the use of expressions. cc rust-lang#115585 Adds documentation to this new feature introduced in rust-lang#133720.

…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

Rename `Piece::String` to `Piece::Lit` This renames Piece::String to Piece::Lit to avoid shadowing std::string::String and removes "pub use Piece::*;".

…=matthewjasper Add mermaid graphs of NLL regions and SCCs to polonius MIR dump This PR expands the polonius MIR dump again with a couple of mermaid charts ported from the graphviz version: - the NLL region graph - and the NLL SCCs I still have done zero visual design on this until now, but [here's](https://gistpreview.github.io/?fbbf900fed2ad21108c7ca0353456398) how it looks (i.e. still bad) just to give an idea of the result. r? `````@matthewjasper````` (feel free to reassign) or anyone

Update books ## rust-lang/book 3 commits in 82a4a49789bc96db1a1b2a210b4c5ed7c9ef0c0d..fa312a343fbff01bc6cef393e326817f70719813 2025-01-22 17:14:29 UTC to 2025-01-22 15:09:26 UTC - chore: reformat src with dprint (rust-lang/book#4211) - Redirects: get rid of the weird gap in Ch. 20 sections! (rust-lang/book#4209) - Document that `use` is also for `precise capturing` (rust-lang/book#4210) ## rust-lang/edition-guide 1 commits in d56e0f3a0656b7702ca466d4b191e16c28262b82..4ed5a1a4a2a7ecc2e529a5baaef04f7bc7917eda 2025-01-21 21:39:56 UTC to 2025-01-21 21:39:56 UTC - Add alternatives for static-mut-refs (rust-lang/edition-guide#354) ## rust-lang/nomicon 3 commits in 625b200e5b33a5af35589db0bc454203a3d46d20..bc2298865544695c63454fc1f9f98a3dc22e9948 2025-01-23 19:01:24 UTC to 2025-01-20 14:37:52 UTC - corrected grammatical error. (rust-lang/nomicon#477) - Remove `#![start]` attribute (rust-lang/nomicon#478) - Update guidance on uninitialized fields to use &raw mut instead of addr_of_mut! (rust-lang/nomicon#476) ## rust-lang/reference 10 commits in 293af991003772bdccf2d6b980182d84dd055942..93b921c7d3213d38d920f7f905a3bec093d2217d 2025-01-25 21:59:01 UTC to 2025-01-14 17:28:04 UTC - distinct 'static' items never overlap (rust-lang/reference#1657) - Change `'_static` to `'static` as an invalid lifetime parameter name (rust-lang/reference#1721) - reword reference about inert attributes (rust-lang/reference#1719) - Provide a better error message for broken links in mdbook-spec (rust-lang/reference#1716) - Remove unstable vectorcall (rust-lang/reference#1717) - Move the function pointer example (rust-lang/reference#1718) - references and Box must be non-null (rust-lang/reference#1715) - Fix filename for theme customization (rust-lang/reference#1711) - Add Identifier Syntax to Several Chapters (rust-lang/reference#1597) - move r[rules] to the left of the main body, using a grid (rust-lang/reference#1710)

…check-not-add, r=workingjubilee ABI-required target features: warn when they are missing in base CPU Part of rust-lang#135408: instead of adding ABI-required features to the target we build for LLVM, check that they are already there. Crucially we check this after applying `-Ctarget-cpu` and `-Ctarget-feature`, by reading `sess.unstable_target_features`. This means we can tweak the ABI target feature check without changing the behavior for any existing user; they will get warnings but the target features behave as before. The test changes here show that we are un-doing the "add all required target features" part. Without the full rust-lang#135408, there is no way to take a way an ABI-required target feature with `-Ctarget-cpu`, so we cannot yet test that part. Cc ``@workingjubilee``

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`

fmease · 2025-01-29T02:12:28Z

@bors r+ rollup=never p=5

bors · 2025-01-29T02:12:32Z

📌 Commit 2839307 has been approved by fmease

It is now in the queue for this repository.

bors · 2025-01-29T05:00:25Z

⌛ Testing commit 2839307 with merge ccc9ba5...

rust-highfive · 2025-01-29T07:44:20Z

📣 Toolstate changed by #136225!

Tested on commit ccc9ba5.
Direct link to PR: #136225

🎉 nomicon on windows: test-fail → test-pass (cc @JohnTitor @Gankra @frewsxcv).
🎉 nomicon on linux: test-fail → test-pass (cc @JohnTitor @Gankra @frewsxcv).

@JohnTitor

Tested on commit rust-lang/rust@ccc9ba5. Direct link to PR: <rust-lang/rust#136225> 🎉 nomicon on windows: test-fail → test-pass (cc @JohnTitor @Gankra @frewsxcv). 🎉 nomicon on linux: test-fail → test-pass (cc @JohnTitor @Gankra @frewsxcv).

bors · 2025-01-29T07:45:28Z

☀️ Test successful - checks-actions
Approved by: fmease
Pushing ccc9ba5 to master...

rust-timer · 2025-01-29T07:47:32Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#135625	[cfg_match] Document the use of expressions.	`88b4dc3484925a83190b16c73a32c212888624b8` (link)
#135902	Do not consider child bound assumptions for rigid alias	`11f82abd6801dde175f3b77b77f66ad0940e5f88` (link)
#135943	Rename `Piece::String` to `Piece::Lit`	`3d3557d73ffdb07f01e84ff664793f5c3e98ec65` (link)
#136104	Add mermaid graphs of NLL regions and SCCs to polonius MIR …	`7ce5f438f2fab4b9fb7b5a81c5c335c45f3cfe38` (link)
#136143	Update books	`d3f5483fb1e88cf5efd05b84b70eb23141c68569` (link)
#136147	ABI-required target features: warn when they are missing in…	`bd867cb746566ade40c62f6c02237a435018a5af` (link)
#136164	Refactor FnKind variant to hold &Fn	`8433ca30501ba11543c28dc5a568e8f4c84252ae` (link)

previous master: 122fb29eb6

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-01-29T09:03:00Z

Finished benchmarking commit (ccc9ba5): 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 -2.5%, secondary 0.0%)

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.2%, 2.3%]	2
Improvements ✅ (primary)	-2.5%	[-3.5%, -1.4%]	2
Improvements ✅ (secondary)	-2.3%	[-3.4%, -1.1%]	2
All ❌✅ (primary)	-2.5%	[-3.5%, -1.4%]	2

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

Results (primary -0.0%, secondary -0.0%)

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

Bootstrap: 776.092s -> 778.134s (0.26%)
Artifact size: 328.45 MiB -> 328.46 MiB (0.00%)

klensy · 2025-01-29T09:29:48Z

#135943 was pushed after r+

c410-f3r and others added 18 commits January 21, 2025 17:54

[cfg_match] Document the use of expressions

7d9fe91

add NLL region graph to the polonius MIR dump

1ee7582

add NLL SCCs to polonius MIR dump

052e9b4

tidy up html structure

6bdc2dc

- invert pre/code which was an invalid combination, that works fine in practice - remove unneeded code wrapper for graphs

Update books

cedd3e2

ABI-required target features: warn when they are missing in base CPU …

93ee180

…(rather than silently enabling them)

update comments

3f6ffa1

parse_format optimize import use

3026545

Do not assume child bound assumptions for rigid alias

3f8ce7c

Make item self/non-self bound naming less whack

009d687

Refactor FnKind variant to hold &Fn

c22a271

Rollup merge of rust-lang#135625 - c410-f3r:cfg-match-foo-bar-baz, r=…

53f343f

…tgross35,jhpratt [cfg_match] Document the use of expressions. cc rust-lang#115585 Adds documentation to this new feature introduced in rust-lang#133720.

Rollup merge of rust-lang#135943 - hkBst:opt_imports, r=estebank

dbb092b

Rename `Piece::String` to `Piece::Lit` This renames Piece::String to Piece::Lit to avoid shadowing std::string::String and removes "pub use Piece::*;".

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

2839307

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`

rustbot added the rollup A PR which is a rollup label Jan 29, 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 Jan 29, 2025

bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 29, 2025

bors merged commit ccc9ba5 into rust-lang:master Jan 29, 2025
7 checks passed

rustbot added this to the 1.86.0 milestone Jan 29, 2025

fmease deleted the rollup-fm7m744 branch January 29, 2025 15:25

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 7 pull requests #136225

Rollup of 7 pull requests #136225

fmease commented Jan 29, 2025

fmease commented Jan 29, 2025

bors commented Jan 29, 2025

bors commented Jan 29, 2025

rust-highfive commented Jan 29, 2025

bors commented Jan 29, 2025

rust-timer commented Jan 29, 2025

rust-timer commented Jan 29, 2025

klensy commented Jan 29, 2025

Rollup of 7 pull requests #136225

Rollup of 7 pull requests #136225

Conversation

fmease commented Jan 29, 2025

fmease commented Jan 29, 2025

bors commented Jan 29, 2025

bors commented Jan 29, 2025

rust-highfive commented Jan 29, 2025

bors commented Jan 29, 2025

rust-timer commented Jan 29, 2025

rust-timer commented Jan 29, 2025

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

klensy commented Jan 29, 2025