Revert #149516 to fix i686-pc-windows-gnu host

[mati865]

Revert #149516 because it caused dist to pick up x86_64 libwinpthreads.dll dependency, resulting in broken toolchain.

Note, I didn't use the procedure explained at: https://forge.rust-lang.org/compiler/reviews.html#reverts because the revert button isn't there.

This reverts commit 5afd8ff, reversing
changes made to 7cb02f9.

[Kivooeo]

This revert looks good to me (except issue link in commit). It just rolls back to what was already working. Do you want a specific review from Jieyou?

View changes since this review

[mati865]

Thanks.
He reviewed the previous PR , so I wanted to let him know about the revert.

Regarding the commit message, I asked about it in #145456 (comment) and the response was to keep it.

Increasing priority per https://forge.rust-lang.org/compiler/reviews.html#priority

@bors p=5

(It can be included in rollups)

[tgross35]

The toolchain is broken so we should get this in,

@bors r=Kivooeo,tgross35

If you get the chance, it would be nice to add this bit to the message:

This reverts commit 985933c5806c18741cc07431a6c7eb14bbf67677, reversing
changes made to 2fb805367dd3012ce5c50865d03c86e70bf10f0f.

(assuming that's the right commit) which is part of what git does automatically and in the rustc-dev-guide. Just to avoid digging up the PR to see which commit got undone.

[bors]

📌 Commit 83459c6 has been approved by Kivooeo,tgross35

It is now in the queue for this repository.

[tgross35]

@bors p=9

Putting this ahead of the rollup so there's a chance of having things fixed in the next nightly

[rustbot]

⚠️ Warning ⚠️

• There are issue links (such as #123) in the commit messages of the following commits.
  Please move them to the PR description, to avoid spamming the issues with references to the commit, and so this bot can automatically canonicalize them to avoid issues with subtree.
  • fdea885

[mati865]

@bors r=Kivooeo,tgross35

[bors]

📌 Commit fdea885 has been approved by Kivooeo,tgross35

It is now in the queue for this repository.

[bors]

⌛ Testing commit fdea885 with merge 5325015...

[jieyouxu]

Note, I didn't use the procedure explained at: forge.rust-lang.org/compiler/reviews.html#reverts because the revert button isn't there.

Hm yeah, maybe we should also mention this form in case of rollups 🤷

[bors]

☀️ Test successful - checks-actions
Approved by: Kivooeo,tgross35
Pushing 5325015 to main...

[github-actions]

What is this?

This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.

Comparing 83e49b7 (parent) -> 5325015 (this PR)

Test differences

Show 2 test diffs

2 doctest diffs were found. These are ignored, as they are noisy.

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard 5325015e29874334003d33d77b295d57f593f06a --output-dir test-dashboard

And then open test-dashboard/index.html in your browser to see an overview of all executed tests.

Job duration changes

1. dist-apple-various: 4382.0s -> 5441.4s (+24.2%)
2. dist-i686-msvc: 10249.0s -> 8013.7s (-21.8%)
3. dist-x86_64-apple: 8478.6s -> 7459.4s (-12.0%)
4. dist-s390x-linux: 5439.1s -> 4805.1s (-11.7%)
5. dist-powerpc64le-linux-musl: 5518.0s -> 4928.7s (-10.7%)
6. dist-ohos-aarch64: 4223.9s -> 4664.1s (+10.4%)
7. dist-powerpc64-linux: 5017.8s -> 5513.9s (+9.9%)
8. dist-ohos-x86_64: 3991.6s -> 4362.2s (+9.3%)
9. tidy: 180.2s -> 163.9s (-9.0%)
10. aarch64-msvc-2: 5045.6s -> 4612.2s (-8.6%)

How to interpret the job duration changes?

Job durations can vary a lot, based on the actual runner instance
that executed the job, system noise, invalidated caches, etc. The table above is provided
mostly for t-infra members, for simpler debugging of potential CI slow-downs.

[jieyouxu]

I usually do

git revert -m1 COMMIT

which also auto-generates the reversing commit message. I tend to also message it a little (e.g. link the PR and add some context).

[rust-timer]

Finished benchmarking commit (5325015): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

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

Max RSS (memory usage)

Results (primary 4.3%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

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

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: 469.131s -> 469.794s (0.14%)
Artifact size: 386.75 MiB -> 386.75 MiB (-0.00%)

[jieyouxu]

Hm yeah, maybe we should also mention this form in case of rollups 🤷

Ok it turns out that isn't the reason, but rather I suspect it's because main has branch protection that prevents a revert PR that you create from being able to directly merge into main without going through bors, so the "Revert" button gets hidden.

Anyway, revert doc update: rust-lang/rust-forge#982