Skip to content
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

Rollup of 10 pull requests #138350

Merged
merged 27 commits into from
Mar 11, 2025
Merged

Rollup of 10 pull requests #138350

merged 27 commits into from
Mar 11, 2025

Conversation

Kobzol
Copy link
Contributor

@Kobzol Kobzol commented Mar 11, 2025

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

mustartt and others added 27 commits March 4, 2025 10:06
Just to avoid surprises, the amount of used keys is not large.
`bootstrap` and `llvm_enzyme` are now both in the extra `check-cfg` list
in bootstrap, so they doesn't need to be handled explicitly in
`Cargo.toml` files.
The command is called `post-merge-report` not `post-merge-analysis`.
Co-authored-by: Vadim Petrochenkov <vadim.petrochenkov@gmail.com>
…kingjubilee

[AIX] Fix hangs during testing

Fixes all current test hangs experienced during CI runs.
1. ipv6 link-local (the loopback device) gets assigned an automatic zone id of 1, causing the assert to fail and hang in `library/std/src/net/udp/tests.rs`
2. Const alloc does not fail gracefully
3. Debuginfo test has problem with gdb auto load safe path
…tty, r=jdonszelmann

Improve `-Zunpretty=hir` for parsed attrs

0. Rename `print_something` to `should_render` to make it distinct from `print_attribute` in that it doesn't print anything, it's just a way to probe if a type renders anything.
1. Fixes a few bugs in the `PrintAttribute` derive. Namely, the `__printed_anything` variable was entangled with the `should_render` call, leading us to always render field names but never render commas.
2. Remove the outermost `""` from the attr.
3. Debug print `Symbol`s. I know that this is redundant for some parsed attributes, but there's no good way to distinguish symbols that are ident-like and symbols which are cooked string literals. We could perhaps *conditionally* to fall back to a debug printing if the symbol doesn't match an ident? But seems like overkill.

Based on rust-lang#138060, only review the commits not in that one.
Add maintainers for powerpc64le-unknown-linux-gnu

The instructions are similar to `powerpc64le-unknown-linux-musl`
Document -Z crate-attr

and also add a bunch of tests
…, r=jieyouxu

add tracking issue for unqualified_local_imports

Tracking issue: rust-lang#138299

r? ``````@jieyouxu``````
Allow specifying glob patterns for try jobs

This PR modifies the `try-job` lookup logic to allow glob patterns. So you can e.g. request all MSVC-related jobs with `try-job: *msvc*`.

Best reviewed commit by commit.

r? ``````@marcoieni``````

try-job: `*msvc*`
use next_back() instead of last() on DoubleEndedIterator
…, r=jieyouxu

Remove unnecessary `[lints.rust]` sections.

`bootstrap` and `llvm_enzyme` are now both in the extra `check-cfg` list in bootstrap, so they doesn't need to be handled explicitly in `Cargo.toml` files.

r? ```@jieyouxu```
Fix post-merge workflow

The command is called `post-merge-report` not `post-merge-analysis`. See https://github.com/rust-lang/rust/blob/90384941aae4ea38de00e4702b50757e9b882a19/src/ci/citool/src/main.rs#L379

Noticed it failing in rust-lang#138310 (comment).

r? ``@Kobzol`` (or ``@marcoieni)``
@rustbot rustbot added A-attributes Area: Attributes (`#[…]`, `#![…]`) A-rustc-dev-guide Area: rustc-dev-guide A-rustdoc-json Area: Rustdoc JSON backend labels Mar 11, 2025
@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. 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. rollup A PR which is a rollup labels Mar 11, 2025
@Kobzol
Copy link
Contributor Author

Kobzol commented Mar 11, 2025

Kicked #138343.

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Mar 11, 2025

📌 Commit 64c6ec5 has been approved by Kobzol

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 Mar 11, 2025
@bors
Copy link
Contributor

bors commented Mar 11, 2025

⌛ Testing commit 64c6ec5 with merge f2d69d5...

@bors
Copy link
Contributor

bors commented Mar 11, 2025

☀️ Test successful - checks-actions
Approved by: Kobzol
Pushing f2d69d5 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 11, 2025
@bors bors merged commit f2d69d5 into rust-lang:master Mar 11, 2025
7 checks passed
@rustbot rustbot added this to the 1.87.0 milestone Mar 11, 2025
Copy link

Post-merge analysis result

Test differences

  • x86_64-gnu-nopt
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::cmp (line 3575): [missing] -> pass
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::try_reduce (line 2624): [missing] -> pass
    • [ui] tests/ui/attributes/z-crate-attr/crate-name.rs: [missing] -> pass
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::max_by (line 3201): [missing] -> pass
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::sum (line 3519): [missing] -> pass
    • [ui] tests/ui/attributes/z-crate-attr/garbage.rs: [missing] -> pass
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::array_chunks (line 3483): [missing] -> pass
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::min_by_key (line 3228): [missing] -> pass
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::all (line 2702): [missing] -> pass
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::collect (line 1953): [missing] -> pass
    • (and 155 additional testss)
  • x86_64-gnu-llvm-19-3
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::is_sorted (line 3894): [missing] -> pass
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::min (line 3131): [missing] -> pass
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::gt (line 3846): [missing] -> pass
    • [ui] tests/ui/attributes/z-crate-attr/basic.rs: [missing] -> pass
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::partial_cmp_by (line 3680): [missing] -> pass
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::any (line 2755): [missing] -> pass
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::fold (line 2527): [missing] -> pass
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::partial_cmp (line 3640): [missing] -> pass
    • [ui] tests/ui/attributes/z-crate-attr/comments.rs: [missing] -> pass
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::try_fold (line 2331): [missing] -> pass
    • (and 155 additional testss)
  • x86_64-gnu-stable
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::partial_cmp (line 3651): [missing] -> pass
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::collect (line 1889): [missing] -> pass
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::max (line 3095): [missing] -> pass
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::try_reduce (line 2644): [missing] -> pass
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::max (line 3107): [missing] -> pass
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::eq (line 3730): [missing] -> pass
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::cycle (line 3436): [missing] -> pass
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::max_by_key (line 3168): [missing] -> pass
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::is_sorted_by_key (line 3967): [missing] -> pass
    • [ui] tests/ui/attributes/z-crate-attr/inner-attr.rs: [missing] -> pass
    • (and 155 additional testss)
  • aarch64-gnu
    • [ui] tests/ui/attributes/z-crate-attr/multiple.rs: [missing] -> pass
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::cmp_by (line 3597): [missing] -> pass
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::lt (line 3804): [missing] -> pass
    • [ui] tests/ui/attributes/z-crate-attr/inner-attr.rs: [missing] -> pass
    • [ui] tests/ui/attributes/z-crate-attr/unbalanced-paren.rs: [missing] -> pass
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::collect (line 1929): [missing] -> pass
    • [ui] tests/ui/attributes/z-crate-attr/crate-name.rs: [missing] -> pass
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::is_sorted (line 3894): [missing] -> pass
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::collect_into (line 2079): [missing] -> pass
    • [ui] tests/ui/attributes/z-crate-attr/cfg-false.rs: [missing] -> pass
    • (and 155 additional testss)
  • x86_64-gnu-llvm-18-3
    • compiler/rustc_attr_data_structures/src/lib.rs - find_attr (line 165): [missing] -> ignore
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::min_by_key (line 3228): [missing] -> pass
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::rev (line 3290): [missing] -> pass
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::try_for_each (line 2415): [missing] -> pass
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::collect (line 1953): [missing] -> pass
    • [ui] tests/ui/attributes/z-crate-attr/crate-type.rs: [missing] -> pass
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::collect_into (line 2093): [missing] -> pass
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::sum (line 3519): [missing] -> pass
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::partition_in_place (line 2207): [missing] -> pass
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::partition (line 2147): [missing] -> pass
    • (and 155 additional testss)
  • aarch64-apple
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::fold (line 2527): [missing] -> pass
    • [ui] tests/ui/attributes/z-crate-attr/respect-existing-attrs.rs: [missing] -> pass
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::reduce (line 2575): [missing] -> pass
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::find (line 2806): [missing] -> pass
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::max (line 3095): [missing] -> pass
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::position (line 2986): [missing] -> pass
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::partition (line 2147): [missing] -> pass
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::ge (line 3867): [missing] -> pass
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::try_reduce (line 2634): [missing] -> pass
    • [ui] tests/ui/attributes/z-crate-attr/garbage.rs: [missing] -> pass
    • (and 155 additional testss)
  • x86_64-gnu
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::rposition (line 3044): [missing] -> pass
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::collect (line 1918): [missing] -> pass
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::partial_cmp_by (line 3680): [missing] -> pass
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::all (line 2702): [missing] -> pass
    • [ui] tests/ui/attributes/z-crate-attr/cfg-false.rs: [missing] -> pass
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::array_chunks (line 3473): [missing] -> pass
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::partition_in_place (line 2207): [missing] -> pass
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::reduce (line 2575): [missing] -> pass
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::min (line 3143): [missing] -> pass
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::min_by (line 3261): [missing] -> pass
    • (and 155 additional testss)
  • i686-msvc-1
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::any (line 2755): [missing] -> pass
    • [ui] tests/ui/attributes/z-crate-attr/shebang.rs: [missing] -> pass
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::cycle (line 3436): [missing] -> pass
    • [ui] tests/ui/attributes/z-crate-attr/garbage.rs: [missing] -> pass
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::copied (line 3358): [missing] -> pass
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::partial_cmp (line 3657): [missing] -> pass
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::collect (line 1904): [missing] -> pass
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::find (line 2816): [missing] -> pass
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::try_fold (line 2331): [missing] -> pass
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::cloned (line 3394): [missing] -> pass
    • (and 153 additional testss)
  • x86_64-gnu-llvm-18-1
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::cycle (line 3436): [missing] -> pass
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::partition (line 2147): [missing] -> pass
    • [ui] tests/ui/attributes/z-crate-attr/comments.rs: [missing] -> pass
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::fold (line 2510): [missing] -> pass
    • [ui] tests/ui/attributes/z-crate-attr/multiple.rs: [missing] -> pass
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::product (line 3553): [missing] -> pass
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::collect (line 1939): [missing] -> pass
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::unzip (line 3323): [missing] -> pass
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::try_reduce (line 2624): [missing] -> pass
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::cloned (line 3394): [missing] -> pass
    • (and 153 additional testss)
  • i686-gnu-nopt-1
    • [ui] tests/ui/attributes/z-crate-attr/crate-type.rs: [missing] -> pass
    • [ui] tests/ui/attributes/z-crate-attr/inner-attr.rs: [missing] -> pass
    • [ui] tests/ui/attributes/z-crate-attr/multiple.rs: [missing] -> pass
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::fold (line 2527): [missing] -> pass
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::collect (line 1939): [missing] -> pass
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::find (line 2806): [missing] -> pass
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::fold (line 2486): [missing] -> pass
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::collect (line 1889): [missing] -> pass
    • [ui] tests/ui/attributes/z-crate-attr/respect-existing-attrs.rs: [missing] -> pass
    • library/core/src/iter/traits/iterator.rs - iter::traits::iterator::Iterator::partial_cmp (line 3640): [missing] -> pass
    • (and 153 additional testss)

(and 14 additional diffs)

@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#135987 Clarify iterator by_ref docs ac5c523dabc7b6a2ef596cb50346e2f48fb5f60d (link)
#137967 [AIX] Fix hangs during testing f33fcafdd5f6f5a803a27eae1cfa9498f28317c4 (link)
#138063 Improve -Zunpretty=hir for parsed attrs e8f1247c041677074666c746d6351c01f8ff979d (link)
#138147 Add maintainers for powerpc64le-unknown-linux-gnu bf33ab74bc37920560eaa7e878a63ab169574bda (link)
#138288 Document -Z crate-attr 82d28bff5de3973f4711dffdd13d85e4458004cc (link)
#138300 add tracking issue for unqualified_local_imports 709a15c82c16a9a0380c13b2fa622151be34d3b4 (link)
#138307 Allow specifying glob patterns for try jobs 940193843106b1aeac01e56a0c9d8c96efbb7319 (link)
#138315 use next_back() instead of last() on DoubleEndedIterator 39f4b25a321ca9b4bbbbfa6d74c82a5b0a102b70 (link)
#138330 Remove unnecessary [lints.rust] sections. e72e16a87f5913d004ff6c09882241d08a03c9c8 (link)
#138335 Fix post-merge workflow c8a14dc1a748626559407b9daacff5666a1b2e52 (link)

previous master: ebf0cf75d3

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

@Kobzol Kobzol deleted the rollup-4kj94rq branch March 11, 2025 19:12
@rust-timer
Copy link
Collaborator

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

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

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: 782.898s -> 781.59s (-0.17%)
Artifact size: 365.21 MiB -> 365.22 MiB (0.00%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-attributes Area: Attributes (`#[…]`, `#![…]`) A-rustc-dev-guide Area: rustc-dev-guide A-rustdoc-json Area: Rustdoc JSON backend A-testsuite Area: The testsuite used to check the correctness of rustc 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-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.