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 #138693

Merged
merged 39 commits into from
Mar 19, 2025
Merged

Rollup of 10 pull requests #138693

merged 39 commits into from
Mar 19, 2025

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

hkBst and others added 30 commits January 28, 2025 10:34
…pter-cleaning

"Running tests" chapter cleaning
expand ${workspaceFolder} in sample vim config
It is only used by a single test, yet would take up unnecessary space
once stdlib deps get vendored.
Co-authored-by: Ibraheem Ahmed <ibraheem@ibraheem.ca>
Given that we now only enlarge empty spans to "{" or "}", there shouldn't be
any danger of enlarging beyond a function body.
…add_value_retrieval_methods, r=Amanieu"

This reverts commit 08dfbf4, reversing
changes made to 10bcdad.
clarify BufRead::{fill_buf, consume} docs

Fixes rust-lang#85394
@rustbot rustbot added 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. rollup A PR which is a rollup labels Mar 19, 2025
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=4

@bors
Copy link
Contributor

bors commented Mar 19, 2025

📌 Commit 3b7faca has been approved by matthiaskrgr

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Mar 19, 2025

🌲 The tree is currently closed for pull requests below priority 100. This pull request will be tested once the tree is reopened.

@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 19, 2025
@rust-log-analyzer
Copy link
Collaborator

The job x86_64-gnu-llvm-18 failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
#20 exporting to docker image format
#20 sending tarball 19.5s done
#20 DONE 24.3s
##[endgroup]
Setting extra environment values for docker:  --env ENABLE_GCC_CODEGEN=1 --env GCC_EXEC_PREFIX=/usr/lib/gcc/
[CI_JOB_NAME=x86_64-gnu-llvm-18]
[CI_JOB_NAME=x86_64-gnu-llvm-18]
debug: `DISABLE_CI_RUSTC_IF_INCOMPATIBLE` configured.
---
sccache: Listening on address 127.0.0.1:4226
##[group]Configure the build
configure: processing command line
configure: 
configure: build.configure-args := ['--build=x86_64-unknown-linux-gnu', '--llvm-root=/usr/lib/llvm-18', '--enable-llvm-link-shared', '--set', 'rust.randomize-layout=true', '--set', 'rust.thin-lto-import-instr-limit=10', '--set', 'build.print-step-timings', '--enable-verbose-tests', '--set', 'build.metrics', '--enable-verbose-configure', '--enable-sccache', '--disable-manage-submodules', '--enable-locked-deps', '--enable-cargo-native-static', '--set', 'rust.codegen-units-std=1', '--set', 'dist.compression-profile=balanced', '--dist-compression-formats=xz', '--set', 'rust.lld=false', '--disable-dist-src', '--release-channel=nightly', '--enable-debug-assertions', '--enable-overflow-checks', '--enable-llvm-assertions', '--set', 'rust.verify-llvm-ir', '--set', 'rust.codegen-backends=llvm,cranelift,gcc', '--set', 'llvm.static-libstdcpp', '--enable-new-symbol-mangling']
configure: build.build          := x86_64-unknown-linux-gnu
configure: target.x86_64-unknown-linux-gnu.llvm-config := /usr/lib/llvm-18/bin/llvm-config
configure: llvm.link-shared     := True
configure: rust.randomize-layout := True
configure: rust.thin-lto-import-instr-limit := 10
---
  0     0    0     0    0     0      0      0 --:--:--  0:03:50 --:--:--     0
  0     0    0     0    0     0      0      0 --:--:--  0:03:51 --:--:--     0
  0     0    0     0    0     0      0      0 --:--:--  0:03:51 --:--:--     0
curl: (28) Failed to connect to gcc.gnu.org port 443 after 134682 ms: Couldn't connect to server
error: Cannot download gettext-0.22.tar.gz from http://gcc.gnu.org/pub/gcc/infrastructure/
Command has failed. Rerun with -v to see more details.
Build completed unsuccessfully in 0:08:06
  local time: Wed Mar 19 07:30:22 UTC 2025
  network time: Wed, 19 Mar 2025 07:30:22 GMT
##[error]Process completed with exit code 1.
Post job cleanup.

@matthiaskrgr
Copy link
Member Author

@bors treeclosed-

@bors
Copy link
Contributor

bors commented Mar 19, 2025

⌛ Testing commit 3b7faca with merge a7fc463...

@bors
Copy link
Contributor

bors commented Mar 19, 2025

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 19, 2025
@bors bors merged commit a7fc463 into rust-lang:master Mar 19, 2025
4 of 7 checks passed
@rustbot rustbot added this to the 1.87.0 milestone Mar 19, 2025
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 c4b38a5 (parent) -> a7fc463 (this PR)

Test differences

Show 431 test diffs
  • tests::test_unescape_byte_bad (stage 1): pass -> [missing] (J0)
  • tests::test_unescape_byte_good (stage 1): pass -> [missing] (J0)
  • tests::test_unescape_byte_str_good (stage 1): pass -> [missing] (J0)
  • tests::test_unescape_char_bad (stage 1): pass -> [missing] (J0)
  • tests::test_unescape_char_good (stage 1): pass -> [missing] (J0)
  • tests::test_unescape_raw_byte_str (stage 1): pass -> [missing] (J0)
  • tests::test_unescape_raw_str (stage 1): pass -> [missing] (J0)
  • tests::test_unescape_str_good (stage 1): pass -> [missing] (J0)
  • tests::test_unescape_str_warn (stage 1): pass -> [missing] (J0)
  • [crashes] tests/crashes/136286.rs (stage 1): pass -> [missing] (J1)
  • [crashes] tests/crashes/137706.rs (stage 1): pass -> [missing] (J1)
  • [crashes] tests/crashes/137895.rs (stage 1): pass -> [missing] (J1)
  • [ui] tests/ui/feature-gates/literal-escaper.rs (stage 1): pass -> [missing] (J1)
  • unescape::tests::test_unescape_byte_bad (stage 1): [missing] -> pass (J2)
  • unescape::tests::test_unescape_byte_good (stage 1): [missing] -> pass (J2)
  • unescape::tests::test_unescape_byte_str_good (stage 1): [missing] -> pass (J2)
  • unescape::tests::test_unescape_char_bad (stage 1): [missing] -> pass (J2)
  • unescape::tests::test_unescape_char_good (stage 1): [missing] -> pass (J2)
  • unescape::tests::test_unescape_raw_byte_str (stage 1): [missing] -> pass (J2)
  • unescape::tests::test_unescape_raw_str (stage 1): [missing] -> pass (J2)
  • unescape::tests::test_unescape_str_good (stage 1): [missing] -> pass (J2)
  • unescape::tests::test_unescape_str_warn (stage 1): [missing] -> pass (J2)
  • [crashes] tests/crashes/137706.rs (stage 2): pass -> [missing] (J3)
  • [crashes] tests/crashes/137706.rs (stage 2): ignore (ignored if rustc wasn't built with debug assertions) -> [missing] (J4)
  • [crashes] tests/crashes/136286.rs (stage 2): pass -> [missing] (J5)
  • [crashes] tests/crashes/137895.rs (stage 2): pass -> [missing] (J5)
  • [ui] tests/ui/feature-gates/literal-escaper.rs (stage 2): pass -> [missing] (J6)

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

Job group index

  • J0: aarch64-apple, aarch64-gnu, arm-android, armhf-gnu, dist-i586-gnu-i586-i686-musl, i686-gnu-1, i686-gnu-2, i686-gnu-nopt-1, i686-gnu-nopt-2, i686-mingw-2, i686-mingw-3, i686-msvc-1, i686-msvc-2, test-various, x86_64-apple-1, x86_64-gnu, x86_64-gnu-llvm-18-1, x86_64-gnu-llvm-18-2, x86_64-gnu-llvm-18-3, x86_64-gnu-llvm-19-1, x86_64-gnu-llvm-19-2, x86_64-gnu-llvm-19-3, x86_64-gnu-nopt, x86_64-gnu-stable, x86_64-mingw-1, x86_64-mingw-2, x86_64-msvc-1, x86_64-msvc-2
  • J1: x86_64-gnu-llvm-18-3, x86_64-gnu-llvm-19-3
  • J2: aarch64-apple, aarch64-gnu, i686-gnu-2, i686-gnu-nopt-2, i686-mingw-2, i686-mingw-3, i686-msvc-2, x86_64-apple-1, x86_64-gnu, x86_64-gnu-llvm-18-3, x86_64-gnu-llvm-19-3, x86_64-gnu-nopt, x86_64-gnu-stable, x86_64-mingw-2, x86_64-msvc-2
  • J3: aarch64-gnu, arm-android, armhf-gnu, i686-gnu-1, i686-gnu-nopt-1, i686-msvc-1, x86_64-gnu, x86_64-gnu-llvm-18-1, x86_64-gnu-llvm-18-2, x86_64-gnu-llvm-19-1, x86_64-gnu-llvm-19-2, x86_64-gnu-nopt, x86_64-gnu-stable, x86_64-mingw-1, x86_64-msvc-1
  • J4: aarch64-apple, dist-i586-gnu-i586-i686-musl, test-various, x86_64-apple-1
  • J5: aarch64-apple, aarch64-gnu, arm-android, armhf-gnu, dist-i586-gnu-i586-i686-musl, i686-gnu-1, i686-gnu-nopt-1, i686-msvc-1, test-various, x86_64-apple-1, x86_64-gnu, x86_64-gnu-llvm-18-1, x86_64-gnu-llvm-18-2, x86_64-gnu-llvm-19-1, x86_64-gnu-llvm-19-2, x86_64-gnu-nopt, x86_64-gnu-stable, x86_64-mingw-1, x86_64-msvc-1
  • J6: aarch64-apple, aarch64-gnu, arm-android, armhf-gnu, dist-i586-gnu-i586-i686-musl, i686-gnu-1, i686-gnu-nopt-1, i686-msvc-1, test-various, x86_64-apple-2, x86_64-gnu, x86_64-gnu-llvm-18-1, x86_64-gnu-llvm-18-2, x86_64-gnu-llvm-19-1, x86_64-gnu-llvm-19-2, x86_64-gnu-nopt, x86_64-gnu-stable, x86_64-mingw-1, x86_64-msvc-1

@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#136177 clarify BufRead::{fill_buf, consume} docs d50aa0f2ba6cb6171ebee0b28d81ebcef193deba (link)
#138654 Remove the regex dependency from coretests 065ba27de144f340d6d098c554466a8b0f418812 (link)
#138655 rustc-dev-guide sync d44a24b923f4867f69c28def78d9031b99330543 (link)
#138656 Remove double nesting in post-merge workflow 35aae927fe3b287c620b22e28d8566668e141fd6 (link)
#138658 CI: mirror alpine and centos images to ghcr d3858baeaa90fcc6a1ef31ecaf6b1219fa72087d (link)
#138659 coverage: Don't store a body span in FunctionCoverageInfo d3493e060d195f43ad6367946e61eb2a7fab2bc5 (link)
#138661 Revert: Add *_value methods to proc_macro lib 67c550f2104c1d57aa535a956023752d20eb9647 (link)
#138670 Remove existing AFIDT implementation 130a33ab8fd3d91728da6ef74c691ab69c22880e (link)
#138674 Various codegen_llvm cleanups 836e0e20769f1aa0cd0b96d8c2844cd59fe2c20c (link)
#138684 use then in docs for fuse to enhance readability 7bdc6a9f123b177d3f071586a507015a00f39e4e (link)

previous master: c4b38a5967

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 (a7fc463): comparison URL.

Overall result: ❌ regressions - please read the text below

Our benchmarks found a performance regression caused by this PR.
This might be an actual regression, but it can also be just noise.

Next Steps:

  • If the regression was expected or you think it can be justified,
    please write a comment with sufficient written justification, and add
    @rustbot label: +perf-regression-triaged to it, to mark the regression as triaged.
  • If you think that you know of a way to resolve the regression, try to create
    a new PR with a fix for the regression.
  • If you do not understand the regression or you think that it is just noise,
    you can ask the @rust-lang/wg-compiler-performance working group for help (members of this group
    were already notified of this PR).

@rustbot label: +perf-regression
cc @rust-lang/wg-compiler-performance

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)
6.8% [0.5%, 14.7%] 10
Regressions ❌
(secondary)
3.2% [0.2%, 9.5%] 32
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 6.8% [0.5%, 14.7%] 10

Max RSS (memory usage)

Results (primary 3.5%)

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)
3.5% [2.6%, 4.4%] 2
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 3.5% [2.6%, 4.4%] 2

Cycles

Results (primary 3.2%, 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)
3.2% [0.8%, 10.9%] 9
Regressions ❌
(secondary)
4.3% [1.3%, 10.9%] 6
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-2.7% [-2.9%, -2.5%] 3
All ❌✅ (primary) 3.2% [0.8%, 10.9%] 9

Binary size

Results (primary 8.3%, secondary 8.8%)

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)
8.3% [0.9%, 18.1%] 16
Regressions ❌
(secondary)
11.0% [7.3%, 11.4%] 37
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-0.0% [-0.1%, -0.0%] 9
All ❌✅ (primary) 8.3% [0.9%, 18.1%] 16

Bootstrap: 776.901s -> 773.717s (-0.41%)
Artifact size: 365.07 MiB -> 365.52 MiB (0.12%)

@rustbot rustbot added the perf-regression Performance regression. label Mar 19, 2025
@lqd
Copy link
Member

lqd commented Mar 19, 2025

what.

@rust-timer build 836e0e2

@rust-timer

This comment has been minimized.

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (836e0e2): comparison URL.

Overall result: ❌ regressions - please read the text below

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)
5.4% [0.3%, 14.7%] 13
Regressions ❌
(secondary)
3.3% [0.4%, 9.5%] 31
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-0.1% [-0.1%, -0.1%] 1
All ❌✅ (primary) 5.4% [0.3%, 14.7%] 13

Max RSS (memory usage)

Results (primary -0.1%, secondary -2.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)
2.5% [2.5%, 2.5%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-2.7% [-2.7%, -2.7%] 1
Improvements ✅
(secondary)
-2.2% [-2.2%, -2.2%] 1
All ❌✅ (primary) -0.1% [-2.7%, 2.5%] 2

Cycles

Results (primary 5.5%, secondary 1.0%)

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)
5.5% [2.1%, 10.3%] 4
Regressions ❌
(secondary)
4.6% [1.4%, 10.2%] 3
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-2.6% [-2.8%, -2.5%] 3
All ❌✅ (primary) 5.5% [2.1%, 10.3%] 4

Binary size

Results (primary 8.4%, secondary 11.1%)

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)
8.4% [0.9%, 18.0%] 16
Regressions ❌
(secondary)
11.1% [8.5%, 11.5%] 37
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 8.4% [0.9%, 18.0%] 16

Bootstrap: 776.901s -> 775.979s (-0.12%)
Artifact size: 365.07 MiB -> 365.52 MiB (0.12%)

@lqd
Copy link
Member

lqd commented Mar 20, 2025

cc @oli-obk there’s probably an unexpected change wrt queries in #138674 causing these regressions

@oli-obk
Copy link
Contributor

oli-obk commented Mar 20, 2025

Huh. That PR was not supposed to change anything

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-rustc-dev-guide Area: rustc-dev-guide 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. perf-regression Performance regression. 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet