Skip to content

Rollup of 7 pull requests #140613

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 19 commits into from
May 3, 2025
Merged

Rollup of 7 pull requests #140613

merged 19 commits into from
May 3, 2025

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

m-ou-se and others added 19 commits May 2, 2025 11:19
These randomly break when i change the implementation of format_args!().
resolve: Support imports of associated types and glob imports from traits

Follow up to rust-lang#134754, part of rust-lang#134691.
This PR also closes rust-lang#138711 now.

Prohibiting `use Trait::AssocType;` at name resolution stage doesn't make sense, the name itself is perfectly resolveable.
It's a type checker's problem that the necessary generic args are not passed when the imported `AssocType` is used, so an error should be reported there.

And since we can import associated trait items now, glob imports from traits can also be allowed.
…etrochenkov

organize and extend forbidden target feature tests

In particular this adds some loongarch tests for rust-lang#135015, Cc `@heiher`

Seems like the tests change so much git does not detect the renames; a commit-by-commit review should help.

try-job: `x86_64-gnu-llvm-20-*`
…errors

Remove fragile equal-pointers-unequal tests.

Same as rust-lang#139176

---

These tests were added in rust-lang#127003

These tests stop working when I change implementation details of format_args!(). These tests shouldn't rely on such implementation details.

Do these tests test anything that isn't already covered by other tests? If so, they should be expressed in a less fragile way that doesn't rely on internal details of format_args!().

cc `@GrigorenkoPV,` author of these tests.
…obzol

Update sysinfo to `0.35.0` in bootstrap and `tools/opt-dist`

This release is mostly bugfixes and code improvements.
…ypo, r=cuviper

doc(std): fix typo lchown -> lchmod

chown is irrelevant here, as this function does not affect file ownership.  chmod is the correct function to reference here.
zkvm: remove schmerik as target maintainer

I am no longer actively working on this target so I would like to be dropped from this list.
…r-errors

yet another small borrowck cleanup

The last borrowck changes from rust-lang#139587 which can be reviewed entirely separately.

r? `@compiler-errors`
@rustbot rustbot added 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-libs Relevant to the library team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels May 3, 2025
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented May 3, 2025

📌 Commit 4360fd7 has been approved by matthiaskrgr

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

bors commented May 3, 2025

⌛ Testing commit 4360fd7 with merge 097cd98...

@bors
Copy link
Collaborator

bors commented May 3, 2025

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 097cd98 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 3, 2025
@bors bors merged commit 097cd98 into rust-lang:master May 3, 2025
7 checks passed
@rustbot rustbot added this to the 1.88.0 milestone May 3, 2025
Copy link

github-actions bot commented May 3, 2025

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 d7df5bd (parent) -> 097cd98 (this PR)

Test differences

Show 120 test diffs

Stage 1

  • errors::verify_resolve_anonymous_lifetime_non_gat_report_error_47: pass -> [missing] (J0)
  • errors::verify_resolve_arguments_macro_use_not_allowed_43: pass -> [missing] (J0)
  • errors::verify_resolve_attributes_starting_with_rustc_are_reserved_52: [missing] -> pass (J0)
  • errors::verify_resolve_attributes_starting_with_rustc_are_reserved_54: pass -> [missing] (J0)
  • errors::verify_resolve_bad_macro_import_36: [missing] -> pass (J0)
  • errors::verify_resolve_bad_macro_import_38: pass -> [missing] (J0)
  • errors::verify_resolve_cannot_find_builtin_macro_with_name_55: [missing] -> pass (J0)
  • errors::verify_resolve_cannot_find_builtin_macro_with_name_57: pass -> [missing] (J0)
  • errors::verify_resolve_cannot_use_through_an_import_53: [missing] -> pass (J0)
  • errors::verify_resolve_cannot_use_through_an_import_55: pass -> [missing] (J0)
  • errors::verify_resolve_explicit_anonymous_lifetime_report_error_46: [missing] -> pass (J0)
  • errors::verify_resolve_explicit_anonymous_lifetime_report_error_48: pass -> [missing] (J0)
  • errors::verify_resolve_extern_crate_loading_macro_not_at_crate_root_35: [missing] -> pass (J0)
  • errors::verify_resolve_extern_crate_loading_macro_not_at_crate_root_37: pass -> [missing] (J0)
  • errors::verify_resolve_extern_crate_self_requires_renaming_39: pass -> [missing] (J0)
  • errors::verify_resolve_generic_arguments_in_macro_path_51: [missing] -> pass (J0)
  • errors::verify_resolve_generic_arguments_in_macro_path_53: pass -> [missing] (J0)
  • errors::verify_resolve_imported_macro_not_found_39: [missing] -> pass (J0)
  • errors::verify_resolve_imported_macro_not_found_41: pass -> [missing] (J0)
  • errors::verify_resolve_is_not_directly_importable_36: pass -> [missing] (J0)
  • errors::verify_resolve_is_private_50: [missing] -> pass (J0)
  • errors::verify_resolve_is_private_52: pass -> [missing] (J0)
  • errors::verify_resolve_items_in_traits_are_not_importable_35: pass -> [missing] (J0)
  • errors::verify_resolve_lending_iterator_report_error_44: [missing] -> pass (J0)
  • errors::verify_resolve_lending_iterator_report_error_46: pass -> [missing] (J0)
  • errors::verify_resolve_macro_expanded_extern_crate_cannot_shadow_extern_arguments_43: [missing] -> pass (J0)
  • errors::verify_resolve_macro_expanded_extern_crate_cannot_shadow_extern_arguments_45: pass -> [missing] (J0)
  • errors::verify_resolve_macro_extern_deprecated_40: [missing] -> pass (J0)
  • errors::verify_resolve_macro_extern_deprecated_42: pass -> [missing] (J0)
  • errors::verify_resolve_macro_use_name_already_in_use_38: [missing] -> pass (J0)
  • errors::verify_resolve_macro_use_name_already_in_use_40: pass -> [missing] (J0)
  • errors::verify_resolve_name_reserved_in_attribute_namespace_54: [missing] -> pass (J0)
  • errors::verify_resolve_name_reserved_in_attribute_namespace_56: pass -> [missing] (J0)
  • errors::verify_resolve_static_lifetime_is_reserved_48: [missing] -> pass (J0)
  • errors::verify_resolve_static_lifetime_is_reserved_50: pass -> [missing] (J0)
  • errors::verify_resolve_tool_only_accepts_identifiers_59: pass -> [missing] (J0)
  • errors::verify_resolve_tool_was_already_registered_56: [missing] -> pass (J0)
  • errors::verify_resolve_tool_was_already_registered_58: pass -> [missing] (J0)
  • errors::verify_resolve_trait_impl_mismatch_58: [missing] -> pass (J0)
  • errors::verify_resolve_trait_impl_mismatch_60: pass -> [missing] (J0)
  • errors::verify_resolve_underscore_lifetime_is_reserved_47: [missing] -> pass (J0)
  • errors::verify_resolve_underscore_lifetime_is_reserved_49: pass -> [missing] (J0)
  • errors::verify_resolve_unnamed_crate_root_import_42: [missing] -> pass (J0)
  • errors::verify_resolve_unnamed_crate_root_import_44: pass -> [missing] (J0)
  • errors::verify_resolve_variable_is_not_bound_in_all_patterns_49: [missing] -> pass (J0)
  • errors::verify_resolve_variable_is_not_bound_in_all_patterns_51: pass -> [missing] (J0)
  • [ui] tests/ui/codegen/equal-pointers-unequal/as-cast/basic.rs: pass -> [missing] (J2)
  • [ui] tests/ui/codegen/equal-pointers-unequal/as-cast/function.rs: pass -> [missing] (J2)
  • [ui] tests/ui/codegen/equal-pointers-unequal/as-cast/print.rs: pass -> [missing] (J2)
  • [ui] tests/ui/codegen/equal-pointers-unequal/exposed-provenance/basic.rs: pass -> [missing] (J2)
  • [ui] tests/ui/codegen/equal-pointers-unequal/exposed-provenance/function.rs: pass -> [missing] (J2)
  • [ui] tests/ui/codegen/equal-pointers-unequal/exposed-provenance/print.rs: pass -> [missing] (J2)
  • [ui] tests/ui/codegen/equal-pointers-unequal/strict-provenance/basic.rs: pass -> [missing] (J2)
  • [ui] tests/ui/codegen/equal-pointers-unequal/strict-provenance/function.rs: pass -> [missing] (J2)
  • [ui] tests/ui/codegen/equal-pointers-unequal/strict-provenance/print.rs: pass -> [missing] (J2)
  • [ui] tests/ui/error-codes/E0253.rs: pass -> [missing] (J2)
  • [ui] tests/ui/target-feature/abi-incompatible-target-feature-attribute.rs#x86: [missing] -> pass (J2)
  • [ui] tests/ui/target-feature/abi-incompatible-target-feature-flag-enable.rs#riscv: [missing] -> pass (J2)
  • [ui] tests/ui/target-feature/abi-incompatible-target-feature-flag-enable.rs#x86: [missing] -> pass (J2)
  • [ui] tests/ui/target-feature/abi-irrelevant-target-feature-flag-disable.rs: [missing] -> pass (J2)
  • [ui] tests/ui/target-feature/abi-required-target-feature-attribute.rs: [missing] -> pass (J2)
  • [ui] tests/ui/target-feature/abi-required-target-feature-flag-disable.rs#aarch64: [missing] -> pass (J2)
  • [ui] tests/ui/target-feature/abi-required-target-feature-flag-disable.rs#loongarch: [missing] -> pass (J2)
  • [ui] tests/ui/target-feature/abi-required-target-feature-flag-disable.rs#x86: [missing] -> pass (J2)
  • [ui] tests/ui/target-feature/abi-required-target-feature-flag-disable.rs#x86-implied: [missing] -> pass (J2)
  • [ui] tests/ui/target-feature/allowed-softfloat-target-feature-attribute.rs: pass -> [missing] (J2)
  • [ui] tests/ui/target-feature/allowed-softfloat-target-feature-flag-disable.rs: pass -> [missing] (J2)
  • [ui] tests/ui/target-feature/forbidden-hardfloat-target-feature-flag-disable-neon.rs: pass -> [missing] (J2)
  • [ui] tests/ui/target-feature/forbidden-hardfloat-target-feature-flag-disable.rs: pass -> [missing] (J2)
  • [ui] tests/ui/target-feature/forbidden-hardfloat-target-feature-flag.rs: pass -> [missing] (J2)
  • [ui] tests/ui/use/import_trait_associated_item_bad.rs: [missing] -> pass (J2)
  • [ui] tests/ui/use/import_trait_associated_item_glob.rs: [missing] -> pass (J2)

Stage 2

  • [ui] tests/ui/codegen/equal-pointers-unequal/as-cast/basic.rs: pass -> [missing] (J1)
  • [ui] tests/ui/codegen/equal-pointers-unequal/as-cast/function.rs: pass -> [missing] (J1)
  • [ui] tests/ui/codegen/equal-pointers-unequal/exposed-provenance/basic.rs: pass -> [missing] (J1)
  • [ui] tests/ui/codegen/equal-pointers-unequal/exposed-provenance/function.rs: pass -> [missing] (J1)
  • [ui] tests/ui/codegen/equal-pointers-unequal/exposed-provenance/print.rs: pass -> [missing] (J1)
  • [ui] tests/ui/codegen/equal-pointers-unequal/strict-provenance/basic.rs: pass -> [missing] (J1)
  • [ui] tests/ui/codegen/equal-pointers-unequal/strict-provenance/function.rs: pass -> [missing] (J1)
  • [ui] tests/ui/codegen/equal-pointers-unequal/strict-provenance/print.rs: pass -> [missing] (J1)
  • [ui] tests/ui/error-codes/E0253.rs: pass -> [missing] (J1)
  • [ui] tests/ui/target-feature/abi-incompatible-target-feature-attribute.rs#riscv: [missing] -> pass (J1)
  • [ui] tests/ui/target-feature/abi-incompatible-target-feature-attribute.rs#x86: [missing] -> pass (J1)
  • [ui] tests/ui/target-feature/abi-incompatible-target-feature-flag-enable.rs#riscv: [missing] -> pass (J1)
  • [ui] tests/ui/target-feature/abi-incompatible-target-feature-flag-enable.rs#x86: [missing] -> pass (J1)
  • [ui] tests/ui/target-feature/abi-irrelevant-target-feature-flag-disable.rs: [missing] -> pass (J1)
  • [ui] tests/ui/target-feature/abi-required-target-feature-attribute.rs: [missing] -> pass (J1)
  • [ui] tests/ui/target-feature/abi-required-target-feature-flag-disable.rs#aarch64: [missing] -> pass (J1)
  • [ui] tests/ui/target-feature/abi-required-target-feature-flag-disable.rs#loongarch: [missing] -> pass (J1)
  • [ui] tests/ui/target-feature/abi-required-target-feature-flag-disable.rs#riscv: [missing] -> pass (J1)
  • [ui] tests/ui/target-feature/abi-required-target-feature-flag-disable.rs#x86: [missing] -> pass (J1)
  • [ui] tests/ui/target-feature/abi-required-target-feature-flag-disable.rs#x86-implied: [missing] -> pass (J1)
  • [ui] tests/ui/target-feature/allowed-softfloat-target-feature-attribute.rs: pass -> [missing] (J1)
  • [ui] tests/ui/target-feature/allowed-softfloat-target-feature-flag-disable.rs: pass -> [missing] (J1)
  • [ui] tests/ui/target-feature/forbidden-hardfloat-target-feature-flag-disable-implied.rs: pass -> [missing] (J1)
  • [ui] tests/ui/target-feature/forbidden-hardfloat-target-feature-flag-disable-neon.rs: pass -> [missing] (J1)
  • [ui] tests/ui/target-feature/forbidden-hardfloat-target-feature-flag-disable.rs: pass -> [missing] (J1)
  • [ui] tests/ui/target-feature/forbidden-hardfloat-target-feature-flag.rs: pass -> [missing] (J1)
  • [ui] tests/ui/use/import_trait_associated_item_bad.rs: [missing] -> pass (J1)
  • [ui] tests/ui/use/import_trait_associated_item_glob.rs: [missing] -> pass (J1)

(and 8 additional test diffs)

Additionally, 12 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 097cd98869cf07a2860bef16c0d4a2b3b019b23a --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-x86_64-apple: 7437.4s -> 10339.7s (39.0%)
  2. dist-apple-various: 7950.9s -> 5297.7s (-33.4%)
  3. aarch64-apple: 3839.5s -> 4658.7s (21.3%)
  4. x86_64-apple-1: 6453.8s -> 7667.7s (18.8%)
  5. dist-aarch64-apple: 5383.5s -> 4945.2s (-8.1%)
  6. x86_64-mingw-2: 7252.5s -> 6781.1s (-6.5%)
  7. x86_64-rust-for-linux: 2598.4s -> 2748.7s (5.8%)
  8. dist-x86_64-msvc-alt: 7277.6s -> 7688.2s (5.6%)
  9. dist-android: 2603.9s -> 2460.0s (-5.5%)
  10. x86_64-msvc-2: 7394.3s -> 6992.6s (-5.4%)
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

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#138712 resolve: Support imports of associated types and glob impor… 8b545ce7220570315fde9ac3c1af94f1fe1e3246 (link)
#140395 organize and extend forbidden target feature tests 6beec96669b717935bcd78a6e11f19abd711bdfd (link)
#140576 Remove fragile equal-pointers-unequal tests. f17bc49bb625011631530219290494119d8c2de3 (link)
#140582 Update sysinfo to 0.35.0 in bootstrap and tools/opt-dist b9cc06cdda1b2ac9e4cfb9cefde30ec570a402eb (link)
#140595 doc(std): fix typo lchown -> lchmod fe9df864f869fa8a6a320d7f1832319a81a87b73 (link)
#140597 zkvm: remove schmerik as target maintainer 9f9a8202c7343b459345b4a683e2d827ee857245 (link)
#140604 yet another small borrowck cleanup cec6d077ec577fc9721bc1de940ac043dc19b1ec (link)

previous master: d7df5bdf29

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
Copy link
Collaborator

Finished benchmarking commit (097cd98): 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 0.8%, secondary -1.9%)

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.0% [0.4%, 7.2%] 24
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-1.2% [-1.4%, -0.9%] 2
Improvements ✅
(secondary)
-1.9% [-1.9%, -1.9%] 1
All ❌✅ (primary) 0.8% [-1.4%, 7.2%] 26

Cycles

Results (primary 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.6% [0.4%, 1.0%] 17
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-0.5% [-0.7%, -0.4%] 4
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 0.4% [-0.7%, 1.0%] 21

Binary size

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

Bootstrap: 770.259s -> 768.722s (-0.20%)
Artifact size: 365.51 MiB -> 365.56 MiB (0.01%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.