Fix macOS and Windows installers when rust-docs is not available.

[ehuss]

This fixes the macOS .pkg and Windows .msi installers to work when rust-docs is not available. If the rust-docs component is not built, then the installer would fail. This adds the rust-docs component to the filtering mechanism so that the rust-docs line of the distribution definition aren't included.

I tested installing and uninstalling both with and without the rust-docs component available.

This happens on the aarch64-apple-darwin distribution provided by rust-lang since we currently disable the rust-docs component due to long build times. An alternate solution would be to just enable the rust-docs component on aarch64-apple-darwin since there are faster build systems.

Fixes #109877

[rustbot]

r? @Mark-Simulacrum

(rustbot has picked a reviewer for you, use r? to override)

[Mark-Simulacrum]

For rustup IIRC we have the fallback mechanism where we pull in a Linux rust-docs, but I guess that's not really possible for pkg (on apple) or msi (on windows) installers, at least without restructuring CI so that they're built after Linux dist completes?

Does this handle the same problem for our windows installers?

[ehuss]

Does this handle the same problem for our windows installers?

The Windows distributions all include rust-docs (including aarch64-pc-windows-msvc, which btw installs in the wrong directory, x86 instead of ARM). So for now, at least, they shouldn't need any modification. I do not know if the msi fails if the docs are not available. I can look into that if you want.

[Mark-Simulacrum]

Hm, ok. We may want to disable docs there soon so if it's not too hard, let's check on that, but r=me other than that.

[ehuss]

OK, I pushed an update that makes the MSI installer also handle the case when rust-docs is not built. I tested by running the installer built with and without docs.

[Mark-Simulacrum]

Thanks!

@bors r+

[bors]

📌 Commit 6b57a34 has been approved by Mark-Simulacrum

It is now in the queue for this repository.

[bors]

⌛ Testing commit 6b57a34 with merge 68e67609ffe004649408b3b6ebf8aee00b1a1a70...

[bors]

💔 Test failed - checks-actions

[ehuss]

@bors retry

crates.io network blip

[bors]

⌛ Testing commit 6b57a34 with merge 1d1f769d3900238eca078ba2c8dbca127fd7170e...

[bors]

💔 Test failed - checks-actions

[ehuss]

@bors retry

crates.io network blip

[rust-log-analyzer]

The job dist-aarch64-linux failed! Check out the build log: (web) (plain)

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

[bors]

⌛ Testing commit 6b57a34 with merge 749b487...

[bors]

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing 749b487 to master...

[rust-timer]

Finished benchmarking commit (749b487): 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

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)	1.3%	[1.3%, 1.3%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-0.6%	[-0.7%, -0.5%]	4
Improvements ✅ (secondary)	-2.4%	[-2.4%, -2.4%]	1
All ❌✅ (primary)	-0.2%	[-0.7%, 1.3%]	5

Cycles

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.4%	[0.4%, 0.4%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-0.5%	[-0.5%, -0.5%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-0.0%	[-0.5%, 0.4%]	2

[rust-log-analyzer]

The job dist-aarch64-linux failed! Check out the build log: (web) (plain)

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