Rollup of 5 pull requests by fmease · Pull Request #126397 · rust-lang/rust

fmease · 2024-06-13T11:08:21Z

Successful merges:

Don't build a broken/untested profiler runtime on mingw targets #122613 (Don't build a broken/untested profiler runtime on mingw targets)
change method resolution to constrain hidden types instead of rejecting method candidates #123962 (change method resolution to constrain hidden types instead of rejecting method candidates)
[1/2] clean-up / general improvements #126088 ([1/2] clean-up / general improvements)
Avoid ICES after reporting errors on erroneous patterns #126320 (Avoid ICES after reporting errors on erroneous patterns)
std::unix::fs::link using direct linkat call for Solaris. #126351 (std::unix::fs::link using direct linkat call for Solaris.)

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Signed-off-by: onur-ozkan <work@onurozkan.dev>

Since we support solaris 11 and macOs Sierra as minimum, we can get rid of the runtime overhead.

For PGO/coverage tests that don't need to build or run an actual artifact, we can use `-Zno-profiler-runtime` to run the test even when the profiler runtime is not available.

The profiler runtime is no longer built in mingw test jobs, so these tests should naturally be skipped by `//@ needs-profiler-support`.

… candidates

Don't build a broken/untested profiler runtime on mingw targets Context: https://rust-lang.zulipchat.com/#narrow/stream/131828-t-compiler/topic/Why.20build.20a.20broken.2Funtested.20profiler.20runtime.20on.20mingw.3F rust-lang#75872 added `--enable-profiler` to the `x86_64-mingw` job (to cause some additional tests to run), but had to also add `//@ ignore-windows-gnu` to all of the tests that rely on the profiler runtime actually *working*, because it's broken on that target. We can achieve a similar outcome by going through all the `//@ needs-profiler-support` tests that don't actually need to produce/run a binary, and making them use `-Zno-profiler-runtime` instead, so that they can run even in configurations that don't have the profiler runtime available. Then we can remove `--enable-profiler` from `x86_64-mingw`, and still get the same amount of testing. This PR also removes `--enable-profiler` from the mingw dist builds, since it is broken/untested on that target. Those builds have had that flag for a very long time.

change method resolution to constrain hidden types instead of rejecting method candidates Some of these are in probes and may affect inference. This is therefore a breaking change. This allows new code to compile on stable: ```rust trait Trait {} impl Trait for u32 {} struct Bar<T>(T); impl Bar<u32> { fn foo(self) {} } fn foo(x: bool) -> Bar<impl Sized> { if x { let x = foo(false); x.foo(); //^ this used to not find the `foo` method, because while we did equate `x`'s type with possible candidates, we didn't allow opaque type inference while doing so } todo!() } ``` r? `@compiler-errors` fixes rust-lang#121404 cc rust-lang#116652

[1/2] clean-up / general improvements This PR applies various clippy suggestions on the tools. I have only applied the ones that make sense and left out trivial changes (e.g., suggestions like 'remove &' are ignored to keep the original commit history for the lines). I am planning to do the same for the library and compiler, but those will add too many changes to this PR, so I will handle them in a separate PR later.

Avoid ICES after reporting errors on erroneous patterns fixes rust-lang#109812 fixes rust-lang#125914 fixes rust-lang#124004

std::unix::fs::link using direct linkat call for Solaris. Since we support solaris 11 as minimum, we can get rid of the runtime overhead. try-job: dist-various-2

fmease · 2024-06-13T11:08:34Z

@bors r+ rollup=never p=5

bors · 2024-06-13T11:08:36Z

📌 Commit 5172833 has been approved by fmease

It is now in the queue for this repository.

bors · 2024-06-13T14:04:12Z

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

git checkout rollup-44sglom (switch to your branch)
git fetch upstream master (retrieve the latest master)
git rebase upstream/master -p (rebase on top of it)
Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
git push self rollup-44sglom --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

Removing tests/ui/methods/opaque_param_in_ufc.stderr
Removing tests/crashes/125914.rs
Removing tests/crashes/109812.rs
Auto-merging src/tools/tidy/src/ext_tool_checks.rs
CONFLICT (content): Merge conflict in src/tools/tidy/src/ext_tool_checks.rs
Auto-merging src/tools/compiletest/src/runtest.rs
Auto-merging src/tools/compiletest/src/header.rs
Automatic merge failed; fix conflicts and then commit the result.

bors · 2024-06-13T15:02:47Z

☔ The latest upstream changes (presumably #126396) made this pull request unmergeable. Please resolve the merge conflicts.

onur-ozkan and others added 28 commits June 6, 2024 21:21

compiletest: apply considerable clippy suggestions

5b72e72

Signed-off-by: onur-ozkan <work@onurozkan.dev>

build_helper: apply considerable clippy suggestions

643e410

Signed-off-by: onur-ozkan <work@onurozkan.dev>

build-manifest: apply considerable clippy suggestions

2715ba1

Signed-off-by: onur-ozkan <work@onurozkan.dev>

jsondoclint: apply considerable clippy suggestions

ea47bce

Signed-off-by: onur-ozkan <work@onurozkan.dev>

remote-test-server: apply considerable clippy suggestions

be99e19

Signed-off-by: onur-ozkan <work@onurozkan.dev>

remote-test-client: apply considerable clippy suggestions

27e05f6

Signed-off-by: onur-ozkan <work@onurozkan.dev>

lint-docs: apply considerable clippy suggestions

44b1a6b

Signed-off-by: onur-ozkan <work@onurozkan.dev>

opt-dist: apply considerable clippy suggestions

c32b55e

Signed-off-by: onur-ozkan <work@onurozkan.dev>

tidy: apply considerable clippy suggestions

ed1e5c9

Signed-off-by: onur-ozkan <work@onurozkan.dev>

fix bootstrap CI failure

eaa45c8

Signed-off-by: onur-ozkan <work@onurozkan.dev>

std::unix::fs::link using direct linkat call for Solaris and macOs.

c81ffab

Since we support solaris 11 and macOs Sierra as minimum, we can get rid of the runtime overhead.

Use -Zno-profiler-runtime instead of //@ needs-profiler-support

a84f754

For PGO/coverage tests that don't need to build or run an actual artifact, we can use `-Zno-profiler-runtime` to run the test even when the profiler runtime is not available.

Don't build a known-broken profiler runtime in x86_64-mingw

0c67f32

Remove //@ ignore-windows-gnu from tests that need the profiler

d2ecfbb

The profiler runtime is no longer built in mingw test jobs, so these tests should naturally be skipped by `//@ needs-profiler-support`.

Remove broken/untested --enable-profiler from mingw dist builds

beb45a4

Avoid follow-up errors on erroneous patterns

2733b8a

Replace some Option<Diag> with Result<(), Diag>

a621701

Replace some Option<Diag> with Result<(), Diag>

ece3e3e

Replace some Option<Diag> with Result<(), Diag>

e8d6170

Replace a bool with a Result<(), ErrorGuaranteed>

7566307

Use diagnostic method for diagnostics

b28221e

Add some tests

c75f728

Method resolution constrains hidden types instead of rejecting method…

9cf60ee

… candidates

Rollup merge of rust-lang#126320 - oli-obk:pat_ice, r=lcnr

2a7a689

Avoid ICES after reporting errors on erroneous patterns fixes rust-lang#109812 fixes rust-lang#125914 fixes rust-lang#124004

Rollup merge of rust-lang#126351 - devnexen:to_sol11_upd, r=ChrisDenton

5172833

std::unix::fs::link using direct linkat call for Solaris. Since we support solaris 11 as minimum, we can get rid of the runtime overhead. try-job: dist-various-2

rustbot added A-run-make Area: port run-make Makefiles to rmake.rs A-rustdoc-json Area: Rustdoc JSON backend labels Jun 13, 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 Jun 13, 2024

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 13, 2024

fmease closed this Jun 13, 2024

fmease deleted the rollup-44sglom branch June 13, 2024 18:35

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 5 pull requests#126397

Rollup of 5 pull requests#126397
fmease wants to merge 28 commits intorust-lang:masterfrom
fmease:rollup-44sglom

fmease commented Jun 13, 2024

Uh oh!

fmease commented Jun 13, 2024

Uh oh!

bors commented Jun 13, 2024

Uh oh!

bors commented Jun 13, 2024

Uh oh!

bors commented Jun 13, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

Uh oh!

Conversation

fmease commented Jun 13, 2024

Uh oh!

fmease commented Jun 13, 2024

Uh oh!

bors commented Jun 13, 2024

Uh oh!

bors commented Jun 13, 2024

Uh oh!

bors commented Jun 13, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants