Skip to content

Rollup of 4 pull requests #141717

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
May 29, 2025
Merged

Rollup of 4 pull requests #141717

merged 9 commits into from
May 29, 2025

Conversation

jhpratt
Copy link
Member

@jhpratt jhpratt commented May 29, 2025

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

tamird and others added 9 commits May 24, 2025 08:24
The implementation delegates to `<ByteStr as Display>::fmt`.

Link: rust-lang/libs-team#550
Link: rust-lang#139984.
This adds running of cargo's tests to the aarch64-apple-darwin job. The
reason for this is that tier-1 targets are ostensibly supposed to run
tests for host tools, but we are not doing that here. We do have fairly
good coverage in Cargo's CI, but we don't have much coverage of beta or
stable. I think it would be good to have a fallback here.
…ross,bjorn3

Stabilize `repr128`

## Stabilisation report

The `repr128` feature ([tracking issue](rust-lang#56071)) allows the use of `#[repr(u128)]` and `#[repr(i128)]` on enums in the same way that other primitive representations such as `#[repr(u64)]` can be used. For example:

```rust
#[repr(u128)]
enum Foo {
    One = 1,
    Two,
    Big = u128::MAX,
}

#[repr(i128)]
enum Bar {
    HasThing(u16) = 42,
    HasSomethingElse(i64) = u64::MAX as i128 + 1,
    HasNothing,
}
```

This is the final part of adding 128-bit integers to Rust ([RFC 1504](https://rust-lang.github.io/rfcs/1504-int128.html)); all other parts of 128-bit integer support were stabilised in rust-lang#49101 back in 2018.

From a design perspective, `#[repr(u128)]`/`#[repr(i128)]` function like `#[repr(u64)]`/`#[repr(i64)]` but for 128-bit integers instead of 64-bit integers. The only differences are:

- FFI safety: as `u128`/`i128` are not currently considered FFI safe, neither are `#[repr(u128)]`/`#[repr(i128)]` enums (I discovered this wasn't the case while drafting this stabilisation report, so I have submitted rust-lang#138282 to fix this).
- Debug info: while none of the major debuggers currently support 128-bit integers, as of LLVM 20 `rustc` will emit valid debuginfo for both DWARF and PDB (PDB makes use of the same natvis that is also used for all enums with fields, whereas DWARF has native support).

Tests for `#[repr(u128)]`/`#[repr(i128)]` enums include:
- [ui/enum-discriminant/repr128.rs](https://github.com/rust-lang/rust/blob/385970f0c1fd0c09bac426b02f38300c0b1ba9a2/tests/ui/enum-discriminant/repr128.rs): checks that 128-bit enum discriminants have the correct values.
- [debuginfo/msvc-pretty-enums.rs](https://github.com/rust-lang/rust/blob/385970f0c1fd0c09bac426b02f38300c0b1ba9a2/tests/debuginfo/msvc-pretty-enums.rs): checks the PDB debuginfo is correct.
- [run-make/repr128-dwarf](https://github.com/rust-lang/rust/blob/385970f0c1fd0c09bac426b02f38300c0b1ba9a2/tests/run-make/repr128-dwarf/rmake.rs): checks the DWARF debuginfo is correct.

Stabilising this feature does not require any changes to the Rust Reference as [the documentation on primitive representations](https://doc.rust-lang.org/nightly/reference/type-layout.html#r-layout.repr.primitive.intro) already includes `u128` and `i128`.

Closes rust-lang#56071
Closes rust-lang/reference#1368

r? lang

```@rustbot``` label +I-lang-nominated +T-lang
add `CStr::display`

The implementation delegates to `<ByteStr as Display>::fmt`.

Link: rust-lang/libs-team#550
Link: rust-lang#139984.

r? ```@BurntSushi```
cc ```@Darksonn``` ```@tgross35``` ```@ojeda``` ```@joshtriplett```
coretests: extend and simplify float tests

Also de-duplicate tests by removing a ui test that duplicates the tests in core.
r? `@tgross35`
…ieni,jieyouxu

CI: Add cargo tests to aarch64-apple-darwin

This adds running of cargo's tests to the aarch64-apple-darwin job. The reason for this is that tier-1 targets are ostensibly supposed to run tests for host tools, but we are not doing that here. We do have fairly good coverage in Cargo's CI, but we don't cover the beta or stable branches here. I think it would be good to have a fallback here.

I think this should only add about 7 minutes of CI time, but I have not measured it. The current job is about 1.5 hours.

In summary of the tier-1 targets:

| Target | rust-lang/cargo | rust-lang/rust |
|--------|-----------------|----------------|
| aarch64-apple-darwin | stable/nightly | ❌ (this PR) |
| aarch64-unknown-linux-gnu | stable/nightly | ✓ |
| x86_64-apple-darwin | nightly | ❌ |
| x86_64-pc-windows-gnu | nightly | ❌ |
| x86_64-pc-windows-msvc | stable | ✓ |
| x86_64-unknown-linux-gnu | stable/beta/nightly | ✓ |
| i686-pc-windows-msvc | ❌ | ❌ |
| i686-unknown-linux-gnu | ❌ | ❌ |

try-job: aarch64-apple
@rustbot rustbot added A-run-make Area: port run-make Makefiles to rmake.rs A-rustdoc-json Area: Rustdoc JSON backend A-testsuite Area: The testsuite used to check the correctness of rustc A-tidy Area: The tidy tool S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels May 29, 2025
@jhpratt
Copy link
Member Author

jhpratt commented May 29, 2025

@bors r+ rollup=never p=5

@rustbot rustbot added the rollup A PR which is a rollup label May 29, 2025
@bors
Copy link
Collaborator

bors commented May 29, 2025

📌 Commit ee3e807 has been approved by jhpratt

It is now in the queue for this repository.

@bors 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 May 29, 2025
@bors
Copy link
Collaborator

bors commented May 29, 2025

⌛ Testing commit ee3e807 with merge 8afd710...

@bors
Copy link
Collaborator

bors commented May 29, 2025

☀️ Test successful - checks-actions
Approved by: jhpratt
Pushing 8afd710 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 29, 2025
@bors bors merged commit 8afd710 into rust-lang:master May 29, 2025
10 checks passed
@rustbot rustbot added this to the 1.89.0 milestone May 29, 2025
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#138285 Stabilize repr128 30ad56cbcd31ca14aa04d62cdbe28bfe59aa0e7a (link)
#139994 add CStr::display 7ad3aec497725a513b4072bc0b46fb7382c62cdb (link)
#141571 coretests: extend and simplify float tests 852bd66af1810390e23c6c03b66adcae5f3a05a4 (link)
#141656 CI: Add cargo tests to aarch64-apple-darwin 1092c6d763297866d7b320373c1d86449ed98dfe (link)

previous master: 38081f22c2

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

Copy link

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 38081f2 (parent) -> 8afd710 (this PR)

Test differences

Show 3867 test diffs

Stage 2

  • alt_registry::config_empty_registry_name: [missing] -> pass (J0)
  • alt_registry::publish_with_registry_dependency: [missing] -> pass (J0)
  • artifact_dep::non_build_script_deps_adopt_specified_target_unconditionally: [missing] -> pass (J0)
  • artifact_dep::profile_override_basic: [missing] -> pass (J0)
  • bench::bench_dylib: [missing] -> ignore (bench) (J0)
  • bench::bench_with_examples: [missing] -> ignore (bench) (J0)
  • binary_name::binary_name1: [missing] -> pass (J0)
  • build::cargo_compile_with_unsupported_short_config_flag: [missing] -> pass (J0)
  • build::example_as_rlib: [missing] -> pass (J0)
  • build::run_proper_binary_main_rs: [missing] -> pass (J0)
  • build::staticlib_rlib_and_bin: [missing] -> pass (J0)
  • build::uplift_dsym_of_bin_on_mac_when_broken_link_exists: [missing] -> pass (J0)
  • build_script::custom_build_env_var_encoded_rustflags: [missing] -> pass (J0)
  • build_script::links_duplicates_old_registry: [missing] -> pass (J0)
  • build_script::test_new_syntax_with_old_msrv: [missing] -> pass (J0)
  • cargo_add::invalid_vers::case: [missing] -> pass (J0)
  • cargo_add::list_features_path::case: [missing] -> pass (J0)
  • cargo_add::optional::case: [missing] -> pass (J0)
  • cargo_add::preserve_features_sorted::case: [missing] -> pass (J0)
  • cargo_add::unknown_inherited_feature::case: [missing] -> pass (J0)
  • cargo_config::gated: [missing] -> pass (J0)
  • cargo_config::unmerged_toml: [missing] -> pass (J0)
  • cargo_features::feature_required_dependency: [missing] -> pass (J0)
  • cargo_info::basic::case: [missing] -> pass (J0)
  • cargo_info::with_locked_outside_ws::case: [missing] -> pass (J0)
  • cargo_init::bin_already_exists_explicit_nosrc::case: [missing] -> pass (J0)
  • cargo_remove::dev::case: [missing] -> pass (J0)
  • cargo_remove::last_dep::case: [missing] -> pass (J0)
  • cargo_tree::features::dep_feature_various: [missing] -> pass (J0)
  • cfg::cfg_booleans_config: [missing] -> pass (J0)
  • check::targets_selected_all: [missing] -> pass (J0)
  • check_cfg::features_with_deps: [missing] -> pass (J0)
  • clean::clean_p_only_cleans_specified_package: [missing] -> pass (J0)
  • core::source_id::tests::test_stable_hash: [missing] -> pass (J0)
  • docscrape::issue_10545: [missing] -> ignore (rustdoc scrape examples flags are unstable) (J0)
  • features2::decouple_host_deps_nested: [missing] -> pass (J0)
  • features::feature_activates_missing_feature: [missing] -> pass (J0)
  • features::invalid_feature_name_slash_error: [missing] -> pass (J0)
  • features_namespaced::dependency_with_crate_syntax: [missing] -> pass (J0)
  • features_namespaced::namespaced_shadowed_dep: [missing] -> pass (J0)
  • features_namespaced::publish_no_implicit: [missing] -> pass (J0)
  • fix::fixes_extra_mut: [missing] -> pass (J0)
  • fix::migrate_project_to_package: [missing] -> pass (J0)
  • fix_n_times::fix_one_suggestion: [missing] -> pass (J0)
  • freshness::verify_source_before_recompile: [missing] -> pass (J0)
  • git::fetch_downloads: [missing] -> pass (J0)
  • git::github_fastpath_error_message: [missing] -> ignore (CARGO_PUBLIC_NETWORK_TESTS must be set) (J0)
  • git_shallow::gitoxide_fetch_shallow_dep_two_revs: [missing] -> pass (J0)
  • glob_targets::bench_example: [missing] -> pass (J0)
  • inheritable_workspace_fields::inherit_detailed_dependencies: [missing] -> pass (J0)
  • inheritable_workspace_fields::inherit_own_dependencies: [missing] -> pass (J0)
  • inheritable_workspace_fields::warn_inherit_simple_member_def_feat_false_2024_edition: [missing] -> pass (J0)
  • install::install_relative_path_outside_current_ws: [missing] -> pass (J0)
  • install::install_with_redundant_default_mode: [missing] -> pass (J0)
  • install::not_both_vers_and_version: [missing] -> pass (J0)
  • lockfile_path::broken_symlink: [missing] -> pass (J0)
  • lockfile_path::loop_symlink: [missing] -> pass (J0)
  • lockfile_path::must_be_nightly: [missing] -> pass (J0)
  • lto::off_in_manifest_works: [missing] -> pass (J0)
  • metadata::dep_kinds_workspace: [missing] -> pass (J0)
  • offline::offline_resolve_optional_fail: [missing] -> pass (J0)
  • package::discovery_inferred_other_excluded: [missing] -> pass (J0)
  • package::in_workspace: [missing] -> pass (J0)
  • package::workspace_with_renamed_member: [missing] -> pass (J0)
  • patch::from_config_empty: [missing] -> pass (J0)
  • patch::old_git_patch: [missing] -> pass (J0)
  • patch::patch_depends_on_another_patch: [missing] -> pass (J0)
  • profile_config::profile_config_no_warn_unknown_override: [missing] -> pass (J0)
  • profile_custom::invalid_inherits: [missing] -> pass (J0)
  • profile_custom::legacy_commands_support_custom: [missing] -> pass (J0)
  • pub_priv::pub_dev_dependency: [missing] -> pass (J0)
  • registry::mis_hyphenated_http: [missing] -> pass (J0)
  • registry::sparse_retry_multiple: [missing] -> pass (J0)
  • registry::update_backtracking_ok_http: [missing] -> pass (J0)
  • registry_auth::duplicate_index: [missing] -> pass (J0)
  • rename_deps::rename_affects_fingerprint: [missing] -> pass (J0)
  • replace::override_spec_metadata_is_optional: [missing] -> pass (J0)
  • run::quiet_config_alone: [missing] -> pass (J0)
  • run::release_short_works: [missing] -> pass (J0)
  • rustc::build_foo_with_bar_dependency: [missing] -> pass (J0)
  • rustc::fail_with_glob: [missing] -> pass (J0)
  • rustdocflags::target_triple_rustdocflags_works_through_cargo_test: [missing] -> pass (J0)
  • rustflags::target_rustflags_string_and_array_form1: [missing] -> pass (J0)
  • script::cmd_check_with_missing_script: [missing] -> ignore (-Zscript is unstable) (J0)
  • script::cmd_generate_lockfile_with_embedded: [missing] -> ignore (-Zscript is unstable) (J0)
  • script::disallow_explicit_package_autobins: [missing] -> ignore (-Zscript is unstable) (J0)
  • script::disallow_explicit_package_autotests: [missing] -> ignore (-Zscript is unstable) (J0)
  • script::test_no_autolib: [missing] -> ignore (-Zscript is unstable) (J0)
  • test::bad_example: [missing] -> pass (J0)
  • test::doctest_dev_dep: [missing] -> pass (J0)
  • test::panic_abort_test_profile_inherits: [missing] -> ignore (-Zpanic-abort-tests in rustc is unstable) (J0)
  • test::test_all_targets_lib: [missing] -> pass (J0)
  • test::test_panic_abort_with_dep: [missing] -> pass (J0)
  • util::graph::reverse: [missing] -> pass (J0)
  • util::lints::tests::ensure_updated_lints: [missing] -> pass (J0)
  • warning_override::config: [missing] -> pass (J0)
  • warning_override::unknown_value: [missing] -> pass (J0)
  • weak_dep_features::required_features: [missing] -> pass (J0)
  • weak_dep_features::weak_with_host_decouple: [missing] -> pass (J0)
  • workspaces::fetch_fetches_all: [missing] -> pass (J0)

(and 3761 additional test diffs)

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

Job group index

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard 8afd71079a729ac002298239f5010ccaac5807ca --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. x86_64-apple-1: 6641.3s -> 7755.6s (16.8%)
  2. aarch64-apple: 4336.8s -> 4784.4s (10.3%)
  3. dist-apple-various: 8040.5s -> 7291.2s (-9.3%)
  4. dist-x86_64-apple: 9618.1s -> 8830.8s (-8.2%)
  5. dist-x86_64-mingw: 7512.9s -> 8092.7s (7.7%)
  6. x86_64-apple-2: 4571.2s -> 4874.0s (6.6%)
  7. x86_64-msvc-1: 8274.5s -> 8787.5s (6.2%)
  8. dist-aarch64-msvc: 8241.4s -> 8655.0s (5.0%)
  9. dist-ohos-aarch64: 4642.3s -> 4451.6s (-4.1%)
  10. x86_64-gnu-nopt: 5810.9s -> 6039.4s (3.9%)
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.

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (8afd710): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Instruction count

This is the most reliable metric that we have; it was used to determine the overall result at the top of this comment. However, even this metric can sometimes exhibit noise.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
0.5% [0.4%, 0.7%] 2
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results (secondary 1.2%)

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)
2.6% [0.5%, 6.8%] 6
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-0.5% [-0.6%, -0.4%] 5
All ❌✅ (primary) - - 0

Cycles

Results (secondary 0.4%)

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)
1.6% [0.6%, 5.6%] 6
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-0.7% [-1.0%, -0.5%] 6
All ❌✅ (primary) - - 0

Binary size

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

Bootstrap: 777.345s -> 777.423s (0.01%)
Artifact size: 368.43 MiB -> 368.47 MiB (0.01%)

@jhpratt jhpratt deleted the rollup-neu8nzl branch May 29, 2025 20:56
github-actions bot pushed a commit to model-checking/verify-rust-std that referenced this pull request May 30, 2025
Rollup of 4 pull requests

Successful merges:

 - rust-lang#138285 (Stabilize `repr128`)
 - rust-lang#139994 (add `CStr::display`)
 - rust-lang#141571 (coretests: extend and simplify float tests)
 - rust-lang#141656 (CI: Add cargo tests to aarch64-apple-darwin)

Failed merges:

 - rust-lang#141430 (remove `visit_clobber` and move `DummyAstNode` to `rustc_expand`)
 - rust-lang#141636 (avoid some usages of `&mut P<T>` in AST visitors)

r? `@ghost`
`@rustbot` modify labels: rollup
flip1995 pushed a commit to flip1995/rust that referenced this pull request May 31, 2025
Rollup of 4 pull requests

Successful merges:

 - rust-lang#138285 (Stabilize `repr128`)
 - rust-lang#139994 (add `CStr::display`)
 - rust-lang#141571 (coretests: extend and simplify float tests)
 - rust-lang#141656 (CI: Add cargo tests to aarch64-apple-darwin)

Failed merges:

 - rust-lang#141430 (remove `visit_clobber` and move `DummyAstNode` to `rustc_expand`)
 - rust-lang#141636 (avoid some usages of `&mut P<T>` in AST visitors)

r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-run-make Area: port run-make Makefiles to rmake.rs A-rustdoc-json Area: Rustdoc JSON backend A-testsuite Area: The testsuite used to check the correctness of rustc A-tidy Area: The tidy tool merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants