Rollup of 8 pull requests by matthiaskrgr · Pull Request #133006 · rust-lang/rust

matthiaskrgr · 2024-11-13T20:04:28Z

Successful merges:

Implement mixed_integer_ops_unsigned_sub #126046 (Implement mixed_integer_ops_unsigned_sub)
rustdoc: Treat declarative macros more like other item kinds #132302 (rustdoc: Treat declarative macros more like other item kinds)
ABI checks: add support for tier2 arches #132842 (ABI checks: add support for tier2 arches)
compiletest: Add exact-llvm-major-version directive #132995 (compiletest: Add exact-llvm-major-version directive)
Trim extra space when suggesting removing bad let #132996 (Trim extra space when suggesting removing bad let)
Unvacation myself #132998 (Unvacation myself)
[rustdoc] Fix duplicated footnote IDs #133000 ([rustdoc] Fix duplicated footnote IDs)
actually test next solver #133001 (actually test next solver)

r? @ghost
@rustbot modify labels: rollup

See rust-lang#131800 for the data collection behind this change. Also adds a test that exercise the "empty list of features" path.

…ned_sub, r=Amanieu Implement `mixed_integer_ops_unsigned_sub` Implement rust-lang#126043 ACP: rust-lang/libs-team#386 [Accepted]

…o-decl, r=notriddle rustdoc: Treat declarative macros more like other item kinds Apparently at some time in the past we were unable to generate an href for the module path inside the visibility of decl macros 2.0 (`pub(in ...)`). As a result of this, a whole separate function was introduced specifically for printing the visibility of decl macros that didn't attempt to generate any links. The description of PR rust-lang#84074 states: > This fixes the overly-complex invariant mentioned in rust-lang#83237 (comment), where the macro source can't have any links in it only because the cache hasn't been populated yet. I can no longer reproduce the original issue. Reusing the existing visibility rendering logic *seems* to work just fine (I couldn't come up with any counterexamples, though I invite you to prove me wrong). * Fixes rust-lang#83000 * Fixes the visibility showing up "twice" in rustdoc-JSON output: Once as the `visibility` field, once baked into the source[^1] * Fixes `#[doc(hidden)]` not getting rendered on doc(hidden) decl macros 2.0 under `--document-hiden-items` (for decl macros 1.2 the issue remains; I will address this separately when fixing rust-lang#132304). --- <details><summary>Outdated Section</summary> NOTE: The current version of this PR is committing a UI crime, I'd like to receive feedback on that. Maybe you have a satisfactory solution for how to remedy it. Namely, as you know we have two different ways of / modes for highlighting code with color: 1. Only highlighting links / item paths and avoiding to highlight tokens by kind like keywords (to reduce visual noise and maybe also artifact size). Used for item declarations(\*). 2. Highlighting tokens by kind. Used for code blocks written by the user. (\*): With the notable exception being macro declarations! Well, since this PR reuses the same function for rendering the item visibility (which only makes sense), we have a clash of modes: We now use both ways of highlighting code for decl macros: №1 for the visibility, №2 for the rest. This awkward. See for yourself: * On master: ![Screenshot 2024-10-29 at 03-37-48 by_example_vis_named in decl_macro a b c - Rust](https://github.com/user-attachments/assets/22f0ab6e-9ba9-4c4e-8fb0-0741c91d360b) * On this branch: ![Screenshot 2024-10-29 at 03-36-41 by_example_vis_named in decl_macro a b c - Rust](https://github.com/user-attachments/assets/b11d81a3-3e2e-43cb-a5b8-6773a3048732) </details> Furthermore, we now no longer syntax-highlight declarative macros (be it `macro_rules!` or `macro`) since that was inconsistent with the way we render all other item kinds. See (collapsed) *Outdated Section* above. See also rust-lang#132302 (comment). | On master | On this branch | |---|---| | ![Screenshot 2024-11-13 at 16-12-46 by_example_vis_named in decl_macro a b c - Rust](https://github.com/user-attachments/assets/cb3aeb42-a56d-4ced-80d9-f2694f369af1) | ![Screenshot 2024-11-13 at 16-13-22 by_example_vis_named in decl_macro a b c - Rust](https://github.com/user-attachments/assets/b73bee50-1b85-4862-afba-5ad471443ccc) | [^1]: E.g., `"visibility":{"restricted":{"parent":1,"path":"::a"}},/*OMITTED*/,"inner":{"macro":"pub(in a) macro by_example_vis_named($foo:expr) {\n ...\n}"}`

…ngjubilee ABI checks: add support for tier2 arches See rust-lang#131800 for the data collection behind this change. r? RalfJung

compiletest: Add ``exact-llvm-major-version`` directive Now contributors don't need to use `min-llvm-version: X` + `ignore-llvm-version: X+1 - 99`, so they can simply use `exact-llvm-major-version: X` To be honest, I didn't find any usages of that hack other than the one mentioned in the issue. ( `tests/codegen/try_question_mark_nop.rs`) Closes rust-lang#132348. rustc-dev-guide PR for `//@ exact-llvm-major-version`: rust-lang/rustc-dev-guide#2135 r? jieyouxu

Trim extra space when suggesting removing bad `let` Fixes rust-lang#132969

Unvacation myself r? `@ghost`

…riddle [rustdoc] Fix duplicated footnote IDs Fixes rust-lang#131901. Footnote IDs were increased locally (ie, on the docblock) and not globally (ie, on the whole item page). cc `@aDotInTheVoid` r? `@notriddle`

…errors actually test next solver uwu r? `@compiler-errors`

matthiaskrgr · 2024-11-13T20:04:54Z

@bors r+ rollup=never p=5

bors · 2024-11-13T20:04:57Z

📌 Commit 2e13bf6 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2024-11-14T01:15:38Z

⌛ Testing commit 2e13bf6 with merge bd0826a...

bors · 2024-11-14T04:15:50Z

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

rust-timer · 2024-11-14T04:18:06Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#126046	Implement `mixed_integer_ops_unsigned_sub`	`3d9aee1443d384b7788949926c643d1a6979bcfa` (link)
#132302	rustdoc: Treat declarative macros more like other item kinds	`a6466039af9840b4d9536ebcc2a679c5f3c30625` (link)
#132842	ABI checks: add support for tier2 arches	`aacc97d20758db4cf4c4f3d3d58df587b3a80c06` (link)
#132995	compiletest: Add `exact-llvm-major-version` directive	`503178013264b4c1d296b141ab9e6c6dcb88ee9d` (link)
#132996	Trim extra space when suggesting removing bad `let`	`990ce1ecf48b309acfe1e257bad0c8bd8ca06a9b` (link)
#132998	Unvacation myself	`12c44d1e025b2fa23e806d8fe05b9d6c175aa2d6` (link)
#133000	[rustdoc] Fix duplicated footnote IDs	`6e6e41c2adcd677d98be429d8920ae198ed8065b` (link)
#133001	actually test next solver	`d5cc687a6be5fc0efde311493767c4fc9e22e068` (link)

previous master: 8adb4b30f4

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-11-14T05:34:07Z

Finished benchmarking commit (bd0826a): comparison URL.

Overall result: ❌✅ regressions and improvements - no action needed

@rustbot label: -perf-regression

Instruction count

This is the most reliable metric that we have; it was used to determine the overall result at the top of this comment. However, even this metric can sometimes exhibit noise.

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

Max RSS (memory usage)

Results (primary -0.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)	2.0%	[2.0%, 2.0%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-1.2%	[-1.3%, -1.1%]	2
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-0.1%	[-1.3%, 2.0%]	3

Cycles

Results (primary 4.4%)

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)	4.4%	[3.6%, 5.3%]	2
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	4.4%	[3.6%, 5.3%]	2

Binary size

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

Bootstrap: 787.023s -> 786.257s (-0.10%)
Artifact size: 335.29 MiB -> 335.35 MiB (0.02%)

davidzeng0 and others added 18 commits July 24, 2024 19:07

Implement mixed_integer_ops_unsigned_sub

6a5a88e

ABI checks: add support for tier2 arches

295cffc

See rust-lang#131800 for the data collection behind this change. Also adds a test that exercise the "empty list of features" path.

Add exact-llvm-major-version directive

98a7176

Trim extra space when suggesting removing bad let

1136bbf

Address review

81f6105

Unvacation

29889cc

rustdoc: Treat decl macros like other items

9016711

Fix duplicated footnote IDs

d9aac8c

Add regression test for rust-lang#131901

7a8257d

actually test next solver

1170381

Rollup merge of rust-lang#126046 - davidzeng0:mixed_integer_ops_unsig…

f3df2a2

…ned_sub, r=Amanieu Implement `mixed_integer_ops_unsigned_sub` Implement rust-lang#126043 ACP: rust-lang/libs-team#386 [Accepted]

Rollup merge of rust-lang#132842 - veluca93:abi-checks-tier2, r=worki…

a5372ed

…ngjubilee ABI checks: add support for tier2 arches See rust-lang#131800 for the data collection behind this change. r? RalfJung

Rollup merge of rust-lang#132996 - clubby789:unn-let-space, r=jieyouxu

e6b3a55

Trim extra space when suggesting removing bad `let` Fixes rust-lang#132969

Rollup merge of rust-lang#132998 - jieyouxu:undo-vacation, r=jieyouxu

59c5d7d

Unvacation myself r? `@ghost`

Rollup merge of rust-lang#133000 - GuillaumeGomez:footnote-ids, r=not…

292cac9

…riddle [rustdoc] Fix duplicated footnote IDs Fixes rust-lang#131901. Footnote IDs were increased locally (ie, on the docblock) and not globally (ie, on the whole item page). cc `@aDotInTheVoid` r? `@notriddle`

Rollup merge of rust-lang#133001 - lcnr:test-next-solver, r=compiler-…

2e13bf6

…errors actually test next solver uwu r? `@compiler-errors`

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 Nov 13, 2024

bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 14, 2024

bors merged commit bd0826a into rust-lang:master Nov 14, 2024

rustbot added this to the 1.84.0 milestone Nov 14, 2024

matthiaskrgr deleted the rollup-dz6oiq5 branch January 25, 2025 09:13

Navigation Menu

Uh oh!

Uh oh!

Rollup of 8 pull requests - #133006

Rollup of 8 pull requests#133006
bors merged 18 commits into
rust-lang:masterfrom
matthiaskrgr:rollup-dz6oiq5

matthiaskrgr commented Nov 13, 2024

Uh oh!

matthiaskrgr commented Nov 13, 2024

Uh oh!

bors commented Nov 13, 2024

Uh oh!

bors commented Nov 14, 2024

Uh oh!

bors commented Nov 14, 2024

Uh oh!

rust-timer commented Nov 14, 2024

Uh oh!

rust-timer commented Nov 14, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

12 participants

Uh oh!

Uh oh!

Conversation

matthiaskrgr commented Nov 13, 2024

Uh oh!

matthiaskrgr commented Nov 13, 2024

Uh oh!

bors commented Nov 13, 2024

Uh oh!

bors commented Nov 14, 2024

Uh oh!

bors commented Nov 14, 2024

Uh oh!

rust-timer commented Nov 14, 2024

Uh oh!

rust-timer commented Nov 14, 2024

Overall result: ❌✅ regressions and improvements - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

12 participants