Rollup of 7 pull requests #116260

matthiaskrgr · 2023-09-29T08:11:15Z

Successful merges:

ref(bootstrap.py): add eprint function #116133 (ref(bootstrap.py): add eprint function)
Fix noop_method_call detection #116201 (Fix noop_method_call detection)
Remove rustc_lint_defs::lint_array #116231 (Remove rustc_lint_defs::lint_array)
Miri subtree update #116234 (Miri subtree update)
Only visit reachable nodes in SsaLocals. #116239 (Only visit reachable nodes in SsaLocals.)
Clippy backport: Move needless_raw_string_hashes to pedantic #116245 (Clippy backport: Move needless_raw_string_hashes to pedantic)
Make adt_const_params feature suggestion consistent with other features and improve when it is emitted #116253 (Make adt_const_params feature suggestion consistent with other features and improve when it is emitted)

r? @ghost
@rustbot modify labels: rollup

…at wasm tests don't build dependencies

just like `print` but for `stderr`

bump ui test crate The recommended way to run tests locally is `./miri bless -- -- --quiet`, which will show * progress bars * the currently running tests (allowing you to see which ones are still running towards the end of the test suite) * the output of the currently running tests (if they are slow). This means slow running tests can output lines to `stderr` and the last line will be shown after the test name and updated every few hundred milliseconds. As a side effect this PR also fixes rust-lang#2998 and only builds dependencies if any tests actually need them (this means that with the next ui_test update we'll be able to merge all our test suites). Also fixes rust-lang/miri#3052.

also remove a normalization rule that doesn't seem to apply

GC the Stacked Borrows allocation history This handles the biggest contributor to rust-lang/miri#3080 The benchmark that this adds demonstrates the memory improvement here, but our benchmark setup doesn't record memory usage, and `hyperfine` doesn't support emitting memory usage stats. I ran this benchmark manually with `/usr/bin/time -v cargo +miri miri run` 🤷

fix normalization in backtrace-api tests also remove a normalization rule that doesn't seem to apply

Automatic sync from rustc

…and only suggest it when the type can probably work

…lbertlarsan68 ref(bootstrap.py): add `eprint` function Implemented a 3-line function called `eprint` which is just like `print` but for `stderr`. So each `print(..., file=sys.stderr)` becomes `eprint(...)`. <br/> Testing `eprint` function: ```sh $ cat eprint.py ``` ```python import sys def eprint(*args, **kwargs): kwargs['file'] = sys.stderr print(*args, **kwargs) eval('eprint({})'.format(sys.argv[1])) ``` ```sh $ python3 eprint.py '"hello"' hello $ ``` ```sh $ python3 eprint.py '"hello"' 2>/dev/null $ ``` ```sh $ python3 eprint.py '"hello", "world", flush=True, file=sys.stdout' hello world $ ``` ```sh $ python3 eprint.py '"hello", "world", flush=True, file=sys.stdout' 2>/dev/null $ ```

Fix `noop_method_call` detection This needs to be merged before rust-lang#116198 can compile. The error occurs before the compiler is built so this needs to be a separate PR.

…lstrieb Remove `rustc_lint_defs::lint_array`

Miri subtree update r? `@ghost`

Only visit reachable nodes in SsaLocals. Fixes rust-lang#116212

…earth Clippy backport: Move needless_raw_string_hashes to pedantic Really small backport this time. Context: rust-lang/rust-clippy#11415 (comment) I'd rather get this in 1.74 than waiting another release cycle. r? `@Manishearth` cc `@Mark-Simulacrum` This should be merged before beta is branched tomorrow.

…ture, r=compiler-errors Make `adt_const_params` feature suggestion consistent with other features and improve when it is emitted Makes the suggestion to add `adt_const_params` formatted like every other feature gate (notably this makes it such that the playground recognizes it). Additionally improves the situations in which that help is emitted so that it's only emitted when the type would be valid or the type *could* be valid (using a slightly incorrect heuristic that favors suggesting the feature over not) instead of, for example, implying that adding the feature would allow the use of `String`. Also adds the "the only supported types are integers, `bool` and `char`" note to the errors on fn and raw pointers. r? `@compiler-errors`

matthiaskrgr · 2023-09-29T08:11:50Z

@bors r+ rollup=never p=7

bors · 2023-09-29T08:11:52Z

📌 Commit 95262e4 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2023-09-29T09:23:49Z

⌛ Testing commit 95262e4 with merge a66e334...

bors · 2023-09-29T11:58:43Z

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

rust-timer · 2023-09-29T12:00:44Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#116133	ref(bootstrap.py): add `eprint` function	`7cb2aeb0fa5f99d9ce3789a858f34450892d800a` (link)
#116201	Fix `noop_method_call` detection	`85eb17ac9fe7295a4f9ea8f713da2cf679b13a46` (link)
#116231	Remove `rustc_lint_defs::lint_array`	`0a867cd7ecba9c3387eaa0013965ecd5ebdbbbaa` (link)
#116234	Miri subtree update	`11da9e91fa3ca013b9a841e5c91e03909a8341b4` (link)
#116239	Only visit reachable nodes in SsaLocals.	`191dc8880d22129e77284df5e35b1d86c6e38fb9` (link)
#116245	Clippy backport: Move needless_raw_string_hashes to pedantic	`5a7f0357d37fcc9c6afe859a6fbf6b1a86346086` (link)
#116253	Make `adt_const_params` feature suggestion consistent with …	`cda5884d0fea3c188f57987d8dd393d6d54f6395` (link)

previous master: b8536c1aa1

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 · 2023-09-29T13:20:42Z

Finished benchmarking commit (a66e334): 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)	-0.7%	[-0.7%, -0.6%]	2
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)	-	-	0
Regressions ❌ (secondary)	2.9%	[2.0%, 3.8%]	3
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

Cycles

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

Binary size

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

Bootstrap: 631.581s -> 631.779s (0.03%)
Artifact size: 317.22 MiB -> 317.27 MiB (0.02%)

oli-obk and others added 30 commits September 22, 2023 16:08

Bump ui test crate

32c2ed7

Move fail tests that need dependencies into their own folder, so th…

c69e0c2

…at wasm tests don't build dependencies

Bump ui_test crate

0d5f51c

Allow limiting the number of threads running in parallel

e706367

Bump ui_test crate

9f4e7c6

GC the Stacked Borrows allocation history

5f440dd

ref(bootstrap.py): add eprint function

598f11a

just like `print` but for `stderr`

Document new env var

1ec85a8

Explain single element vector

71aea48

fix normalization in backtrace-api tests

ee30aaf

also remove a normalization rule that doesn't seem to apply

Auto merge of rust-lang#3085 - RalfJung:test-norm, r=RalfJung

e86c68a

fix normalization in backtrace-api tests also remove a normalization rule that doesn't seem to apply

Preparing for merge from rustc

fc0d833

Merge from rustc

b1f5c66

clippy

c8a44b1

Auto merge of rust-lang#3087 - rust-lang:rustup-2023-09-27, r=RalfJung

1a3dd7e

Automatic sync from rustc

Preparing for merge from rustc

3b091cb

Merge from rustc

f2623ac

Auto merge of rust-lang#3089 - rust-lang:rustup-2023-09-28, r=RalfJung

024279a

Automatic sync from rustc

Fix noop_method_call detection for new diagnostic items

66bc682

update lockfile

e0f4ab8

Add test for 116212.

255ca18

Only visit reachable nodes in SsaLocals.

3816c15

Move needless_raw_string_hashes to pedantic

07f81cd

Remove rustc_lint_defs::lint_array

f1b7484

make adt_const_params feature suggestion more consistent with others …

b53a1b3

…and only suggest it when the type can probably work

Rollup merge of rust-lang#116201 - Jarcho:noop_fix, r=fee1-dead

e814f1e

Fix `noop_method_call` detection This needs to be merged before rust-lang#116198 can compile. The error occurs before the compiler is built so this needs to be a separate PR.

Rollup merge of rust-lang#116231 - DaniPopes:simpler-lint-array, r=Ni…

0c45018

…lstrieb Remove `rustc_lint_defs::lint_array`

matthiaskrgr added 4 commits September 29, 2023 10:11

Rollup merge of rust-lang#116234 - RalfJung:miri, r=RalfJung

1ed00fe

Miri subtree update r? `@ghost`

Rollup merge of rust-lang#116239 - cjgillot:issue-116212, r=WaffleLapkin

4f09f80

Only visit reachable nodes in SsaLocals. Fixes rust-lang#116212

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 Sep 29, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 29, 2023

bors merged commit a66e334 into rust-lang:master Sep 29, 2023
11 checks passed

rustbot added this to the 1.74.0 milestone Sep 29, 2023

pvdrz mentioned this pull request Oct 4, 2023

Fix divergence from upstream master ferrocene/ferrocene#23

Merged

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 7 pull requests #116260

Rollup of 7 pull requests #116260

matthiaskrgr commented Sep 29, 2023

matthiaskrgr commented Sep 29, 2023

bors commented Sep 29, 2023

bors commented Sep 29, 2023

bors commented Sep 29, 2023

rust-timer commented Sep 29, 2023

rust-timer commented Sep 29, 2023

Rollup of 7 pull requests #116260

Rollup of 7 pull requests #116260

Conversation

matthiaskrgr commented Sep 29, 2023

matthiaskrgr commented Sep 29, 2023

bors commented Sep 29, 2023

bors commented Sep 29, 2023

bors commented Sep 29, 2023

rust-timer commented Sep 29, 2023

rust-timer commented Sep 29, 2023

Overall result: ✅ improvements - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size