Rollup of 8 pull requests by Manishearth · Pull Request #103857 · rust-lang/rust

Manishearth · 2022-11-02T00:00:41Z

Successful merges:

compiletest: set the dylib path when gathering target cfg #103072 (compiletest: set the dylib path when gathering target cfg)
Derive Eq and Hash for ControlFlow #103084 (Derive Eq and Hash for ControlFlow)
Change #[suggestion_*] attributes to use style="..." #103575 (Change #[suggestion_*] attributes to use style="...")
Use stdio in UWP apps #103637 (Use stdio in UWP apps)
Add multivalue target feature to WASM target #103638 (Add multivalue target feature to WASM target)
Detect unused files in src/test/mir-opt and error on them in tidy. #103781 (Detect unused files in src/test/mir-opt and error on them in tidy.)
Migrate sidebar-links-color GUI test to functions #103837 (Migrate sidebar-links-color GUI test to functions)
Print valid --print requests if request is invalid #103839 (Print valid --print requests if request is invalid)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Using the following command: find compiler/ -type f -name '*.rs' -exec perl -i -gpe \ 's/(#\[\w*suggestion)_(short|verbose|hidden)\(\s*(\S+,)?/\1(\3style = "\2",/g' \ '{}' +

This has been supported since Windows 10.0.16299. See https://learn.microsoft.com/en-us/uwp/win32-and-com/win32-apis#apis-from-api-ms-win-core-console-l1-1-0dll

If the compiler is built with `rpath = false`, then it won't find its own libraries unless the library search path is set. We already do that while running the actual compiletests, but rust-lang#100260 added another rustc command for getting the target cfg. Check compiletest suite=codegen mode=codegen (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu) thread 'main' panicked at 'error: failed to get cfg info from "[...]/build/x86_64-unknown-linux-gnu/stage1/bin/rustc" --- stdout --- stderr [...]/build/x86_64-unknown-linux-gnu/stage1/bin/rustc: error while loading shared libraries: librustc_driver-a2a76dc626cd02d2.so: cannot open shared object file: No such file or directory ', src/tools/compiletest/src/common.rs:476:13 Now the library path is set here as well, so it works without rpath.

When someone makes a typo, it can be useful to see the valid options. This is also useful if someone wants to find out about all the options.

…imulacrum compiletest: set the dylib path when gathering target cfg If the compiler is built with `rpath = false`, then it won't find its own libraries unless the library search path is set. We already do that while running the actual compiletests, but rust-lang#100260 added another rustc command for getting the target cfg. Check compiletest suite=codegen mode=codegen (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu) thread 'main' panicked at 'error: failed to get cfg info from "[...]/build/x86_64-unknown-linux-gnu/stage1/bin/rustc" --- stdout --- stderr [...]/build/x86_64-unknown-linux-gnu/stage1/bin/rustc: error while loading shared libraries: librustc_driver-a2a76dc626cd02d2.so: cannot open shared object file: No such file or directory ', src/tools/compiletest/src/common.rs:476:13 Now the library path is set here as well, so it works without rpath.

…=scottmcm Derive `Eq` and `Hash` for `ControlFlow` There's really no reason for `ControlFlow` not to derive these traits. This is the part of rust-lang#96416 that no one objected to, but that PR seems stale. The `Eq` derive was also [requested](https://rust-lang.zulipchat.com/#narrow/stream/219381-t-libs/topic/.60ControlFlow.3A.20Eq.60/near/303610659) by `@lcnr` on Zulip to allow for pattern matching. This change requires an FCP because it's insta-stable. Closes rust-lang#96416.

…davidtwco Change #[suggestion_*] attributes to use style="..." As discussed [on Zulip](https://rust-lang.zulipchat.com/#narrow/stream/336883-i18n/topic/.23100717.20tool_only_span_suggestion), this changes `#[(multipart_)suggestion_{short,verbose,hidden}(...)]` attributes to plain `#[(multipart_)suggestion(...)]` attributes with a `style = "{short,verbose,hidden}"` parameter. It also adds a new style, `tool-only`, that corresponds to `tool_only_span_suggestion`/`tool_only_multipart_suggestion` and causes the suggestion to not be shown in human-readable output at all. Best reviewed commit-by-commit, there's a bit of noise in there. cc rust-lang#100717 `@compiler-errors` r? `@davidtwco`

Use stdio in UWP apps Fixes rust-lang#103233 This has been supported since Windows 10.0.16299. See https://learn.microsoft.com/en-us/uwp/win32-and-com/win32-apis#apis-from-api-ms-win-core-console-l1-1-0dll

Add `multivalue` target feature to WASM target This PR is similar to rust-lang#99643 and rust-lang#97808. It addresses rust-lang#96472 for the `multivalue` target feature. The problem I am trying to fix is to remove the following warning when compiling with `-C target-feature=+multivalue` for `--target=wasm32-unknown-unknown`. ``` warning: unknown feature specified for `-Ctarget-feature`: `multivalue` | = note: it is still passed through to the codegen backend = note: consider filing a feature request ```

Detect unused files in `src/test/mir-opt` and error on them in tidy. Closes rust-lang#97564 . Determining which files are generated by a given mir opt test is somewhat difficult. Because of this, we extract the logic for doing it out into a common crate that both compiletest and tidy can depend on. This avoids making compiletest a dependency of tidy which would negatively impact compile times for tidy. Testing for this is that it catches 5 files that violated this lint (and removes them).

…ks-color-gui-test, r=notriddle Migrate sidebar-links-color GUI test to functions r? `@notriddle`

…rrors Print valid `--print` requests if request is invalid When someone makes a typo, it can be useful to see the valid options. This is also useful if someone wants to find out about all the options.

Manishearth · 2022-11-02T00:00:51Z

@bors r+ p=5

bors · 2022-11-02T00:00:53Z

📌 Commit c2affd5 has been approved by Manishearth

It is now in the queue for this repository.

bors · 2022-11-02T04:27:52Z

⌛ Testing commit c2affd5 with merge a876a4d...

bors · 2022-11-02T07:14:58Z

☀️ Test successful - checks-actions
Approved by: Manishearth
Pushing a876a4d to master...

rust-timer · 2022-11-02T07:17:15Z

📌 Perf builds for each rolled up PR:

PR#	Perf Build Sha
#103839	fc936226dcadc2ce687270c4b82df6da07af2bd9
#103837	0612873fa22e3359ea6c9b17f88eac59c1dae07f
#103781	707c9daa0d777ba01bb21577240a67045bc0c09e
#103638	16e5f7c47d14b5ed80a65883a39ddaca0be09ad9
#103637	f21a4ce5068510ed7db1e2d8711478f10cd1870b
#103575	83da311ce9120b82738604e7d21e21bffa9d84c2
#103084	8ce47b113bed0e5104c43e08aa9b6283f4da5d02
#103072	a926e748cc49bec81c9a77db10ffb4cdf2531fb2

previous master: 11ebe6512b

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 · 2022-11-02T08:36:25Z

Finished benchmarking commit (a876a4d): 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.4%	[-0.4%, -0.4%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-0.4%	[-0.4%, -0.4%]	1

Max RSS (memory usage)

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

Cycles

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

inquisitivecrystal and others added 21 commits October 19, 2022 13:25

Derive Eq and Hash for ControlFlow

4a92cf6

Add style= parameter to suggestion attributes

368c4a3

rustfmt diagnostic derive tests

29334b9

Add "tool-only" suggestion style

20f2958

Convert all #[suggestion_*] attributes to #[suggestion(style = "...")]

cd621be

Using the following command: find compiler/ -type f -name '*.rs' -exec perl -i -gpe \ 's/(#\[\w*suggestion)_(short|verbose|hidden)\(\s*(\S+,)?/\1(\3style = "\2",/g' \ '{}' +

Remove #[suggestion_*] attributes

2eeb780

Add multivalue target feature to WASM target

dad28ad

Use stdio in UWP apps

5857c30

This has been supported since Windows 10.0.16299. See https://learn.microsoft.com/en-us/uwp/win32-and-com/win32-apis#apis-from-api-ms-win-core-console-l1-1-0dll

Detect unused files in src/test/mir-opt and error on them in tidy.

17395b4

Print valid --print requests if request is invalid

b20d969

When someone makes a typo, it can be useful to see the valid options. This is also useful if someone wants to find out about all the options.

Migrate sidebar-links-color GUI test to functions

2024f70

Remove unneeded "rustdoc-preferred-dark-theme" setting

a1dfefa

Rollup merge of rust-lang#103637 - ChrisDenton:stdio-uwp, r=thomcc

65d63ca

Use stdio in UWP apps Fixes rust-lang#103233 This has been supported since Windows 10.0.16299. See https://learn.microsoft.com/en-us/uwp/win32-and-com/win32-apis#apis-from-api-ms-win-core-console-l1-1-0dll

Rollup merge of rust-lang#103837 - GuillaumeGomez:migrate-sidebar-lin…

617f246

…ks-color-gui-test, r=notriddle Migrate sidebar-links-color GUI test to functions r? `@notriddle`

Rollup merge of rust-lang#103839 - Nilstrieb:print-list, r=compiler-e…

c2affd5

…rrors Print valid `--print` requests if request is invalid When someone makes a typo, it can be useful to see the valid options. This is also useful if someone wants to find out about all the options.

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 2, 2022

bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 2, 2022

bors merged commit a876a4d into rust-lang:master Nov 2, 2022

rustbot added this to the 1.67.0 milestone Nov 2, 2022

This was referenced Nov 2, 2022

Add rustc --print rustc-path #100681

Closed

errors: generate typed identifiers in each crate #103042

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 8 pull requests#103857

Rollup of 8 pull requests#103857
bors merged 21 commits intorust-lang:masterfrom
Manishearth:rollup-709fui6

Manishearth commented Nov 2, 2022

Uh oh!

Manishearth commented Nov 2, 2022

Uh oh!

bors commented Nov 2, 2022

Uh oh!

bors commented Nov 2, 2022

Uh oh!

bors commented Nov 2, 2022

Uh oh!

rust-timer commented Nov 2, 2022

Uh oh!

rust-timer commented Nov 2, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

12 participants

Uh oh!

Conversation

Manishearth commented Nov 2, 2022

Uh oh!

Manishearth commented Nov 2, 2022

Uh oh!

bors commented Nov 2, 2022

Uh oh!

bors commented Nov 2, 2022

Uh oh!

bors commented Nov 2, 2022

Uh oh!

rust-timer commented Nov 2, 2022

Uh oh!

rust-timer commented Nov 2, 2022

Overall result: ✅ improvements - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

12 participants