Rollup of 5 pull requests #117335

workingjubilee · 2023-10-29T00:08:06Z

Successful merges:

tvOS simulator support on Apple Silicon for rustc #115773 (tvOS simulator support on Apple Silicon for rustc)
Remove cfg_match from the prelude #117162 (Remove cfg_match from the prelude)
-Zunpretty help: add missing possible values #117311 (-Zunpretty help: add missing possible values)
Mark constructor of BinaryHeap as const fn #117316 (Mark constructor of BinaryHeap as const fn)
explain why we don't inline when target features differ #117319 (explain why we don't inline when target features differ)

r? @ghost
@rustbot modify labels: rollup

…ustc, r=thomcc tvOS simulator support on Apple Silicon for rustc Closes or is a subtask of rust-lang#115692. # Tier 3 Target Policy At this tier, the Rust project provides no official support for a target, so we place minimal requirements on the introduction of targets. > * A tier 3 target must have a designated developer or developers (the "target maintainers") on record to be CCed when issues arise regarding the target. (The mechanism to track and CC such developers may evolve over time.) See [`src/doc/rustc/src/platform-support/apple-tvos.md`](https://github.com/rust-lang/rust/blob/4ab4d48ee59968d8d519ccda5e12c9d200cc092f/src/doc/rustc/src/platform-support/apple-tvos.md) > * Targets must use naming consistent with any existing targets; for instance, a target for the same CPU or OS as an existing Rust target should use the same name for that CPU or OS. Targets should normally use the same names and naming conventions as used elsewhere in the broader ecosystem beyond Rust (such as in other toolchains), unless they have a very good reason to diverge. Changing the name of a target can be highly disruptive, especially once the target reaches a higher tier, so getting the name right is important even for a tier 3 target. > * Target names should not introduce undue confusion or ambiguity unless absolutely necessary to maintain ecosystem compatibility. For example, if the name of the target makes people extremely likely to form incorrect beliefs about what it targets, the name should be changed or augmented to disambiguate it. > * If possible, use only letters, numbers, dashes and underscores for the name. Periods (.) are known to cause issues in Cargo. This naming scheme matches `$ARCH-$VENDOR-$OS-$ABI` (I think `sim` is the ABI here) which is matches the iOS apple silicon simulator (`aarch64-apple-ios-sim`). [There is some discussion about renaming some apple simulator targets](rust-lang#115692 (comment)) to match the `-sim` suffix but that is outside the scope of this PR. > * Tier 3 targets may have unusual requirements to build or use, but must not create legal issues or impose onerous legal terms for the Rust project or for Rust developers or users. > > * The target must not introduce license incompatibilities. > * Anything added to the Rust repository must be under the standard Rust license (MIT OR Apache-2.0). > * The target must not cause the Rust tools or libraries built for any other host (even when supporting cross-compilation to the target) to depend on any new dependency less permissive than the Rust licensing policy. This applies whether the dependency is a Rust crate that would require adding new license exceptions (as specified by the tidy tool in the rust-lang/rust repository), or whether the dependency is a native library or binary. In other words, the introduction of the target must not cause a user installing or running a version of Rust or the Rust tools to be subject to any new license requirements. > * Compiling, linking, and emitting functional binaries, libraries, or other code for the target (whether hosted on the target itself or cross-compiling from another target) must not depend on proprietary (non-FOSS) libraries. Host tools built for the target itself may depend on the ordinary runtime libraries supplied by the platform and commonly used by other applications built for the target, but those libraries must not be required for code generation for the target; cross-compilation to the target must not require such libraries at all. For instance, rustc built for the target may depend on a common proprietary C runtime library or console output library, but must not depend on a proprietary code generation library or code optimization library. Rust's license permits such combinations, but the Rust project has no interest in maintaining such combinations within the scope of Rust itself, even at tier 3. > * "onerous" here is an intentionally subjective term. At a minimum, "onerous" legal/licensing terms include but are not limited to: non-disclosure requirements, non-compete requirements, contributor license agreements (CLAs) or equivalent, "non-commercial"/"research-only"/etc terms, requirements conditional on the employer or employment of any particular Rust developers, revocable terms, any requirements that create liability for the Rust project or its developers or users, or any requirements that adversely affect the livelihood or prospects of the Rust project or its developers or users. This contribution is fully available under the standard Rust license with no additional legal restrictions whatsoever. This PR does not introduce any new dependency less permissive than the Rust license policy. The new targets do not depend on proprietary libraries. > * Tier 3 targets should attempt to implement as much of the standard libraries as possible and appropriate (core for most targets, alloc for targets that can support dynamic memory allocation, std for targets with an operating system or equivalent layer of system-provided functionality), but may leave some code unimplemented (either unavailable or stubbed out as appropriate), whether because the target makes it impossible to implement or challenging to implement. The authors of pull requests are not obligated to avoid calling any portions of the standard library on the basis of a tier 3 target not implementing those portions. This new target implements as much of the standard library as the other tvOS targets do. > * The target must provide documentation for the Rust community explaining how to build for the target, using cross-compilation if possible. If the target supports running binaries, or running tests (even if they do not pass), the documentation must explain how to run such binaries or tests for the target, using emulation if possible or dedicated hardware if necessary. I have added the target to the other tvOS targets in [`src/doc/rustc/src/platform-support/apple-tvos.md`](https://github.com/rust-lang/rust/blob/4ab4d48ee59968d8d519ccda5e12c9d200cc092f/src/doc/rustc/src/platform-support/apple-tvos.md) > * Neither this policy nor any decisions made regarding targets shall create any binding agreement or estoppel by any party. If any member of an approving Rust team serves as one of the maintainers of a target, or has any legal or employment requirement (explicit or implicit) that might affect their decisions regarding a target, they must recuse themselves from any approval decisions regarding the target's tier status, though they may otherwise participate in discussions. > * This requirement does not prevent part or all of this policy from being cited in an explicit contract or work agreement (e.g. to implement or maintain support for a target). This requirement exists to ensure that a developer or team responsible for reviewing and approving a target does not face any legal threats or obligations that would prevent them from freely exercising their judgment in such approval, even if such judgment involves subjective matters or goes beyond the letter of these requirements. > * Tier 3 targets must not impose burden on the authors of pull requests, or other developers in the community, to maintain the target. In particular, do not post comments (automated or manual) on a PR that derail or suggest a block on the PR based on a tier 3 target. Do not send automated messages or notifications (via any medium, including via ``@)`` to a PR author or others involved with a PR regarding a tier 3 target, unless they have opted into such messages. > * Backlinks such as those generated by the issue/PR tracker when linking to an issue or PR are not considered a violation of this policy, within reason. However, such messages (even on a separate repository) must not generate notifications to anyone involved with a PR who has not requested such notifications. > * Patches adding or updating tier 3 targets must not break any existing tier 2 or tier 1 target, and must not knowingly break another tier 3 target without approval of either the compiler team or the maintainers of the other tier 3 target. > * In particular, this may come up when working on closely related targets, such as variations of the same architecture with different features. Avoid introducing unconditional uses of features that another variation of the target may not have; use conditional compilation or runtime detection, as appropriate, to let each target run code supported by that target. I acknowledge these requirements and intend to ensure that they are met. This target does not touch any existing tier 2 or tier 1 targets and should not break any other targets.

Remove `cfg_match` from the prelude Fixes rust-lang#117057 cc rust-lang#115585

…rochenkov -Zunpretty help: add missing possible values `-Zunpretty` accepts "thir-tree" and "thir-flat", but that was not shown in `-Zhelp`.

…tor, r=dtolnay Mark constructor of `BinaryHeap` as const fn rust-lang#112353

…ment, r=tmiasko explain why we don't inline when target features differ Follow-up to rust-lang#117141 r? ``@tmiasko``

workingjubilee · 2023-10-29T00:08:19Z

@bors r+ rollup=never p=5

bors · 2023-10-29T00:08:21Z

📌 Commit f907d0e has been approved by workingjubilee

It is now in the queue for this repository.

workingjubilee · 2023-10-29T00:20:19Z

Note, if this needs recreating, that this is a fully disjoint rollup from #117336

bors · 2023-10-29T01:58:49Z

⌛ Testing commit f907d0e with merge 2106b63...

bors · 2023-10-29T03:52:29Z

☀️ Test successful - checks-actions
Approved by: workingjubilee
Pushing 2106b63 to master...

rust-timer · 2023-10-29T03:53:54Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#115773	tvOS simulator support on Apple Silicon for rustc	`91b4ae0cb65e52f38b25af188d9cb13fd22f50cf` (link)
#117162	Remove `cfg_match` from the prelude	`c6d9604bf5892f4a76c915288fec0e82f9e2c27f` (link)
#117311	-Zunpretty help: add missing possible values	`7058f17e3d9b3be1f031a35efbb8efa2221ff4d3` (link)
#117316	Mark constructor of `BinaryHeap` as const fn	`468d0f81cf821725409cba6d4110a828017211da` (link)
#117319	explain why we don't inline when target features differ	`5dfaa0fd206bceaa9d16a3612d8ccce090166731` (link)

previous master: 2cad938a81

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-10-29T07:13:46Z

Finished benchmarking commit (2106b63): 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.4%	[-0.5%, -0.3%]	3
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)	3.9%	[3.7%, 4.0%]	2
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-0.7%	[-0.7%, -0.7%]	1
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: 635.194s -> 635.14s (-0.01%)
Artifact size: 304.42 MiB -> 304.41 MiB (-0.01%)

simlay and others added 13 commits October 6, 2023 11:11

Initial target specification for aarch64-apple-tvos-sim

450d6c5

Fix typos

6c43244

Fix sdkname for tvos simulator

ba5eeda

Update platform docs for aarch64-apple-tvos-sim

4ab4d48

Remove cfg_match from the prelude

0b96e47

-Zunpretty help: add missing possible values

64678d4

mark constructor of BinaryHeap as const fn

4dd7568

explain why we don't inline when target features differ

f7985af

Rollup merge of rust-lang#117162 - c410-f3r:try, r=workingjubilee

61cd3d0

Remove `cfg_match` from the prelude Fixes rust-lang#117057 cc rust-lang#115585

Rollup merge of rust-lang#117311 - RalfJung:unpretty-thir-help, r=pet…

10c9c7c

…rochenkov -Zunpretty help: add missing possible values `-Zunpretty` accepts "thir-tree" and "thir-flat", but that was not shown in `-Zhelp`.

Rollup merge of rust-lang#117316 - Coekjan:const-binary-heap-construc…

2dd37d4

…tor, r=dtolnay Mark constructor of `BinaryHeap` as const fn rust-lang#112353

Rollup merge of rust-lang#117319 - RalfJung:target-feature-inline-com…

f907d0e

…ment, r=tmiasko explain why we don't inline when target features differ Follow-up to rust-lang#117141 r? ``@tmiasko``

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

workingjubilee mentioned this pull request Oct 29, 2023

Rollup of 4 pull requests #117336

Merged

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

bors merged commit 2106b63 into rust-lang:master Oct 29, 2023
12 checks passed

rustbot added this to the 1.75.0 milestone Oct 29, 2023

workingjubilee deleted the rollup-jsomm41 branch October 29, 2023 03:56

bors mentioned this pull request Oct 29, 2023

Turn cfg_match into a builtin #116323

Closed

github-actions bot mentioned this pull request Oct 31, 2023

Automated pull from upstream master ferrocene/ferrocene#74

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 5 pull requests #117335

Rollup of 5 pull requests #117335

workingjubilee commented Oct 29, 2023

workingjubilee commented Oct 29, 2023

bors commented Oct 29, 2023

workingjubilee commented Oct 29, 2023

bors commented Oct 29, 2023

bors commented Oct 29, 2023

rust-timer commented Oct 29, 2023

rust-timer commented Oct 29, 2023

Rollup of 5 pull requests #117335

Rollup of 5 pull requests #117335

Conversation

workingjubilee commented Oct 29, 2023

workingjubilee commented Oct 29, 2023

bors commented Oct 29, 2023

workingjubilee commented Oct 29, 2023

bors commented Oct 29, 2023

bors commented Oct 29, 2023

rust-timer commented Oct 29, 2023

rust-timer commented Oct 29, 2023

Overall result: ✅ improvements - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size