Rollup of 7 pull requests #134039

matthiaskrgr · 2024-12-08T16:18:54Z

Successful merges:

Parse guard patterns #133424 (Parse guard patterns)
compiletest: show the difference between the normalized output and the actual output for lines which didn't match #133733 ( compiletest: show the difference between the normalized output and the actual output for lines which didn't match)
Fix: typo in E0751 error explanation #133993 (Fix: typo in E0751 error explanation)
Adds new intrinsic declaration #134013 (Adds new intrinsic declaration)
Remove unnecessary int_type_width_signed function #134020 (Remove unnecessary int_type_width_signed function)
Advent of tests/ui (misc cleanups and improvements) [2/N] #134024 (Advent of tests/ui (misc cleanups and improvements) [2/N])
deps: Update psm #134038 (deps: Update psm)

r? @ghost
@rustbot modify labels: rollup

…for now

Co-authored-by: Max Niederman <max@maxniederman.com>

Corrected a grammatical error in the explanation for E0751. Changed "exists" to "exist" to improve clarity and ensure proper grammar in the error message.

…e actual output for lines which didn't match example output: ``` failures: ---- [ui] tests/ui/layout/enum.rs stdout ---- diff of stderr: - error: align: AbiAndPrefAlign { abi: Align(2 bytes), pref: $PREF_ALIGN } + error: align: AbiAndPrefAlign { abi: Align(2 bytes), pref: $PREF_ALIN } 2 --> $DIR/enum.rs:9:1 3 | 4 LL | enum UninhabitedVariantAlign { Note: some mismatched output was normalized before being compared - error: align: AbiAndPrefAlign { abi: Align(2 bytes), pref: Align(8 bytes) } - --> /home/jyn/src/rust2/tests/ui/layout/enum.rs:9:1 + error: align: AbiAndPrefAlign { abi: Align(2 bytes), pref: $PREF_ALIN } ```

- Document the test intention, including both the language semantics it is checking, as well as the borrowck diagnostics that this is exercising. - Tag this test with `//@ run-rustfix` as this ui test exercises a suggestion diagnostics to make an immutable local var mutable. - Minor error annotation reformatting.

This is where `assoc-oddities-{1,2}.rs` are located, reunite them!

- Include the original MCVE as reported in <rust-lang#28777>. - Document the intention of the test.

This test exercises the combined effect of the `cfg(target_has_atomic_equal_alignment = "...")` implementation in the compiler as well as the usage of said `cfg(target_has_atomic_equal_alignment)` in `core`.

- Introduce two revisions: one for 32-bit x86 vs one for 64-bit x86_64 and compare & contrast the errors. - Document the test intention and note its limitations.

changes old intrinsic to new declaration

…r=fee1-dead Parse guard patterns This implements the parsing of [RFC3637 Guard Patterns](https://rust-lang.github.io/rfcs/3637-guard-patterns.html) (see also [tracking issue](rust-lang#129967)). This PR is extracted from rust-lang#129996 with minor modifications. cc `@max-niederman`

compiletest: show the difference between the normalized output and the actual output for lines which didn't match example output: ``` failures: ---- [ui] tests/ui/layout/enum.rs stdout ---- diff of stderr: - error: align: AbiAndPrefAlign { abi: Align(2 bytes), pref: $PREF_ALIGN } + error: align: AbiAndPrefAlign { abi: Align(2 bytes), pref: $PREF_ALIN } 2 --> $DIR/enum.rs:9:1 3 | 4 LL | enum UninhabitedVariantAlign { Note: some mismatched output was normalized before being compared - error: align: AbiAndPrefAlign { abi: Align(2 bytes), pref: Align(8 bytes) } - --> /home/jyn/src/rust2/tests/ui/layout/enum.rs:9:1 + error: align: AbiAndPrefAlign { abi: Align(2 bytes), pref: $PREF_ALIN } ```

…iler-errors Fix: typo in E0751 error explanation Corrected a grammatical error in the explanation for E0751. Changed "exists" to "exist" to improve clarity and ensure proper grammar in the error message.

Adds new intrinsic declaration This pr is for rust-lang#132735 removes removes `extern "intrinsic"` I think its the last block of this file and was kind of asking for advice how to handle other files as mentioned in the issue .

Remove unnecessary `int_type_width_signed` function This can just use `Ty::int_size_and_signed` instead of making its own version. You might want to look at this [ignoring whitespace](https://github.com/rust-lang/rust/pull/134020/files?w=1) since a huge bunch of code got un-indented.

Advent of `tests/ui` (misc cleanups and improvements) [2/N] Part of rust-lang#133895. Misc improvements to some ui tests immediately under `tests/ui/`. Best reviewed commit-by-commit. Please see individual commit messages for some further rationale and change summaries. r? compiler

deps: Update psm part of rust-lang#133456, which is blocked due to checks failure see rust-lang#133456 (comment) r? `@ChrisDenton`

matthiaskrgr · 2024-12-08T16:19:16Z

@bors r+ rollup=never p=7

bors · 2024-12-08T16:19:19Z

📌 Commit 5b133fe has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2024-12-08T17:52:58Z

⌛ Testing commit 5b133fe with merge e888a15...

…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#133424 (Parse guard patterns) - rust-lang#133733 ( compiletest: show the difference between the normalized output and the actual output for lines which didn't match) - rust-lang#133993 (Fix: typo in E0751 error explanation) - rust-lang#134013 (Adds new intrinsic declaration) - rust-lang#134020 (Remove unnecessary `int_type_width_signed` function) - rust-lang#134024 (Advent of `tests/ui` (misc cleanups and improvements) [2/N]) - rust-lang#134038 (deps: Update psm) r? `@ghost` `@rustbot` modify labels: rollup

rust-log-analyzer · 2024-12-08T18:32:29Z

The job mingw-check failed! Check out the build log: (web) (plain)

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

  DATADOG_SITE: datadoghq.com
  DATADOG_API_KEY: ***
  DD_GITHUB_JOB_NAME: auto - mingw-check
##[endgroup]
npm error code E404
npm error 404 Not Found - GET https://registry.npmjs.org/@datadog%2fdatadog-ci - Not found
npm error 404
npm error 404  '@datadog/datadog-ci@^2.x.x' is not in this registry.
npm error 404
npm error 404 Note that you can also install from a
npm error 404 tarball, folder, http url, or git url.
npm error A complete log of this run can be found in: /home/runner/.npm/_logs/2024-12-08T18_32_16_579Z-debug-0.log
##[error]Process completed with exit code 1.

bors · 2024-12-08T18:33:07Z

💔 Test failed - checks-actions

matthiaskrgr · 2024-12-08T19:30:48Z

@bors retry

bors · 2024-12-08T22:11:46Z

⌛ Testing commit 5b133fe with merge df5b8e3...

bors · 2024-12-09T00:58:52Z

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

rust-timer · 2024-12-09T01:01:00Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#133424	Parse guard patterns	`2bad4856692b4e9000f219083fa52c90f9665b9e` (link)
#133733	compiletest: show the difference between the normalized ou…	`8f392e447ec7248b07bbdac4f9ad17993351141a` (link)
#133993	Fix: typo in E0751 error explanation	`5d4d6a855eb2b10413eeaf1bbdbb82ca79f4891b` (link)
#134013	Adds new intrinsic declaration	`d514719d619314403ad832e5fab98581d6225cb6` (link)
#134020	Remove unnecessary `int_type_width_signed` function	`bfa13ee64f39b7c5549138d9d4c8c7774e1ed336` (link)
#134024	Advent of `tests/ui` (misc cleanups and improvements) [2/N]	`22c127e70cf956173eaf5e2888c2cef5de8d8a5b` (link)
#134038	deps: Update psm	`270c4cc8767f93770daab55b2d37389e199c5c76` (link)

previous master: 4d669fb34e

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-12-09T02:34:06Z

Finished benchmarking commit (df5b8e3): comparison URL.

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

Max RSS (memory usage)

Results (secondary -0.6%)

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)	-3.3%	[-3.3%, -3.3%]	1
All ❌✅ (primary)	-	-	0

Cycles

Results (primary -2.6%, secondary -1.8%)

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)	-2.6%	[-2.6%, -2.6%]	1
Improvements ✅ (secondary)	-1.8%	[-1.8%, -1.8%]	1
All ❌✅ (primary)	-2.6%	[-2.6%, -2.6%]	1

Binary size

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

Bootstrap: 767.479s -> 766.815s (-0.09%)
Artifact size: 330.87 MiB -> 330.84 MiB (-0.01%)

max-niederman and others added 30 commits November 24, 2024 18:08

add guard_patterns unstable feature, without unstable book chapter …

f8e50d8

…for now

refactor pat parser method names/doc-comments to agree with RFC 3637

35bbc45

add guard pattern AST node

9b8bfed

cover guard patterns in rustfmt

a3a29f5

cover guard patterns in clippy lints

f86915a

parse guard patterns

962c014

Co-authored-by: Max Niederman <max@maxniederman.com>

Fix rustfmt according to review

483f9e2

Fix: typo in E0751 error explanation

120d6b2

Corrected a grammatical error in the explanation for E0751. Changed "exists" to "exist" to improve clarity and ensure proper grammar in the error message.

Address review comments

2459dbb

Remove unnecessary int_type_width_signed function

18d7b9a

Document assign-assign.rs

73b00ca

Move assign-assign.rs to tests/ui/codegen/assign-expr-unit-type.rs

5a79963

Move assign-imm-local-twice.rs to tests/ui/borrowck/

5e07f6e

Document assoc-lang-items.rs

1e3328d

Move assoc-lang-items.rs to tests/ui/lang-items/

6959582

Move assoc-oddities-3.rs under tests/ui/parser/assoc/

b815a93

This is where `assoc-oddities-{1,2}.rs` are located, reunite them!

Adjust assoc-oddities-3.rs

3a33522

- Include the original MCVE as reported in <rust-lang#28777>. - Document the intention of the test.

Move atomic-from-mut-not-available.rs to tests/ui/stdlib-unit-tests/

1247f01

This test exercises the combined effect of the `cfg(target_has_atomic_equal_alignment = "...")` implementation in the compiler as well as the usage of said `cfg(target_has_atomic_equal_alignment)` in `core`.

Adjust atomic-from-mut-not-available.rs

754dec3

- Introduce two revisions: one for 32-bit x86 vs one for 64-bit x86_64 and compare & contrast the errors. - Document the test intention and note its limitations.

Adds new intrinsic declaration

292fd0f

changes old intrinsic to new declaration

deps: Update psm

dd875ed

Rollup merge of rust-lang#133993 - LuanOldCode:fix-e0571-typo, r=comp…

11b0430

…iler-errors Fix: typo in E0751 error explanation Corrected a grammatical error in the explanation for E0751. Changed "exists" to "exist" to improve clarity and ensure proper grammar in the error message.

Rollup merge of rust-lang#134038 - ognevny:update-psm, r=ChrisDenton

5b133fe

deps: Update psm part of rust-lang#133456, which is blocked due to checks failure see rust-lang#133456 (comment) r? `@ChrisDenton`

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 Dec 8, 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 Dec 8, 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 Dec 8, 2024

bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 9, 2024

bors merged commit df5b8e3 into rust-lang:master Dec 9, 2024
7 checks passed

rustbot added this to the 1.85.0 milestone Dec 9, 2024

bors mentioned this pull request Dec 9, 2024

Speed up Parser::expected_tokens #133793

Open

This was referenced Dec 9, 2024

Introduce default_field_values feature #129514

Merged

bootstrap: print{ln}! -> eprint{ln}! (take 2) #134040

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 7 pull requests #134039

Rollup of 7 pull requests #134039

matthiaskrgr commented Dec 8, 2024

matthiaskrgr commented Dec 8, 2024

bors commented Dec 8, 2024

bors commented Dec 8, 2024

rust-log-analyzer commented Dec 8, 2024

bors commented Dec 8, 2024

matthiaskrgr commented Dec 8, 2024

bors commented Dec 8, 2024

bors commented Dec 9, 2024

rust-timer commented Dec 9, 2024

rust-timer commented Dec 9, 2024

Rollup of 7 pull requests #134039

Rollup of 7 pull requests #134039

Conversation

matthiaskrgr commented Dec 8, 2024

matthiaskrgr commented Dec 8, 2024

bors commented Dec 8, 2024

bors commented Dec 8, 2024

rust-log-analyzer commented Dec 8, 2024

bors commented Dec 8, 2024

matthiaskrgr commented Dec 8, 2024

bors commented Dec 8, 2024

bors commented Dec 9, 2024

rust-timer commented Dec 9, 2024

rust-timer commented Dec 9, 2024

Overall result: ✅ improvements - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size