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 6 pull requests #127156

Merged
merged 12 commits into from
Jun 30, 2024
Merged

Rollup of 6 pull requests #127156

merged 12 commits into from
Jun 30, 2024

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

WaffleLapkin and others added 12 commits June 24, 2024 10:15
Since <rust-lang#121358>, `TypeId` is
represented as a `(u64, u64)`. This also made the debug implementation a
lot larger, which is especially apparent with pretty formatting.

Make this less noisy by converting the inner value back to a `u128` then
printing as a tuple struct.

Current:

    TypeId { t: (1403077013027291752, 4518903163082958039) }
    TypeId {
        t: (
            1403077013027291752,
            4518903163082958039,
        ),
    }

New:

    TypeId(25882202575019293479932656973818029271)
    TypeId(
        25882202575019293479932656973818029271,
    )
Updated docs on `#[panic_handler]` in `library/core/src/lib.rs`
…=Mark-Simulacrum

Add `.ignore` file to make `config.toml` searchable in vscode

Based on this answer on [Stack Overflow](https://stackoverflow.com/a/72059075).
… r=Mark-Simulacrum

Small fixme in core now that split_first has no codegen issues

rust-lang#109328 (comment)

BTW, I have a crate implementing exactly this kind of an iterator: https://github.com/GrigorenkoPV/head-tail-iter and I was wondering if it would be worthwhile to try and make an ACP for it to get it included in std (or maybe itertools). My only doubt is that it kinda incentives writing O(n^2) algorithms and is not the hard to replace with a `while let` loop (just as in this PR).
…ler-errors

Remove unused `rustc_trait_selection` dependencies

Found using `cargo-machete`. The `bitflags` and `derivative` crates were added for the new trait solver, but weren't removed when the next trait solver code was uplifted to a separate crate.
Print `TypeId` as a `u128` for `Debug`

Since <rust-lang#121358>, `TypeId` is represented as a `(u64, u64)`. This also made the debug implementation a lot larger, which is especially apparent with pretty formatting.

Change this to convert the inner value back to a `u128` and then print as a tuple struct to make this less noisy.

Current:

    TypeId { t: (1403077013027291752, 4518903163082958039) }
    TypeId {
        t: (
            1403077013027291752,
            4518903163082958039,
        ),
    }

New:

    TypeId(25882202575019293479932656973818029271)
    TypeId(
        25882202575019293479932656973818029271,
    )
@rustbot rustbot added A-meta Area: Issues & PRs about the rust-lang/rust repository itself 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. rollup A PR which is a rollup labels Jun 30, 2024
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=6

@bors
Copy link
Contributor

bors commented Jun 30, 2024

📌 Commit f2c287f 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 Jun 30, 2024
@bors
Copy link
Contributor

bors commented Jun 30, 2024

⌛ Testing commit f2c287f with merge afcf5de...

bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 30, 2024
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#126705 (Updated docs on `#[panic_handler]` in `library/core/src/lib.rs`)
 - rust-lang#126876 (Add `.ignore` file to make `config.toml` searchable in vscode)
 - rust-lang#126906 (Small fixme in core now that split_first has no codegen issues)
 - rust-lang#127023 (CI: rename Rust for Linux CI job)
 - rust-lang#127131 (Remove unused `rustc_trait_selection` dependencies)
 - rust-lang#127134 (Print `TypeId` as a `u128` for `Debug`)

r? `@ghost`
`@rustbot` modify labels: rollup
@rust-log-analyzer
Copy link
Collaborator

The job x86_64-msvc-ext failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
[RUSTC-TIMING] miri test:false 62.642
[RUSTC-TIMING] miri test:false 2.947
    Finished `release` profile [optimized] target(s) in 0.39s
thread 'main' panicked at src/lib.rs:1697:17:
failed to copy `C:\a\rust\rust\build\x86_64-pc-windows-msvc\stage1-tools\x86_64-pc-windows-msvc\release\miri.exe` to `C:\a\rust\rust\build\x86_64-pc-windows-msvc\stage1-tools-bin\miri.exe`: The process cannot access the file because it is being used by another process. (os error 32)
##[endgroup]
Build completed unsuccessfully in 0:00:08
  local time: Sun, Jun 30, 2024 11:07:56 AM
  network time: Sun, 30 Jun 2024 11:07:56 GMT

@bors
Copy link
Contributor

bors commented Jun 30, 2024

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 30, 2024
@matthiaskrgr
Copy link
Member Author

@bors retry

@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 Jun 30, 2024
@bors
Copy link
Contributor

bors commented Jun 30, 2024

⌛ Testing commit f2c287f with merge 6c34855...

@bors
Copy link
Contributor

bors commented Jun 30, 2024

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 30, 2024
@bors bors merged commit 6c34855 into rust-lang:master Jun 30, 2024
7 checks passed
@rustbot rustbot added this to the 1.81.0 milestone Jun 30, 2024
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#126705 Updated docs on #[panic_handler] in `library/core/src/lib… fcbbe01a8d8ab4bba1866e0df397fd30c926b1d4 (link)
#126876 Add .ignore file to make config.toml searchable in vsco… b9eb18a3bc4f5bc181c4c57611270b2d8481ed80 (link)
#126906 Small fixme in core now that split_first has no codegen iss… ef3d5d85e3feb10b9486558d367afed58e9743c0 (link)
#127023 CI: rename Rust for Linux CI job 9be95fbd7282f48ca11f48b7c0410e6c63bcca8d (link)
#127131 Remove unused rustc_trait_selection dependencies 39099b739f1474100de78d9e2589340db64c2424 (link)
#127134 Print TypeId as a u128 for Debug 62545d60c249225b652f6e889264b68f180e201d (link)

previous master: 2975a21b5d

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

@bors bors mentioned this pull request Jun 30, 2024
@rust-timer
Copy link
Collaborator

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

Results (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)
- - 0
Regressions ❌
(secondary)
1.9% [1.9%, 1.9%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Binary size

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

Bootstrap: 695.757s -> 696.099s (0.05%)
Artifact size: 324.71 MiB -> 324.69 MiB (-0.00%)

@matthiaskrgr matthiaskrgr deleted the rollup-jjfd464 branch September 1, 2024 17:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-meta Area: Issues & PRs about the rust-lang/rust repository itself 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants