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 5 pull requests #125086

Merged
merged 16 commits into from
May 13, 2024
Merged

Rollup of 5 pull requests #125086

merged 16 commits into from
May 13, 2024

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

fmease and others added 16 commits January 14, 2024 13:48
Modifying an environment variable would make the function unsafe to
call.
…e line

In particular, lifetime-generic associated types often have a
`where Self: 'a` bound, which we can format on the same line.
Suggested-by: Caleb Cartwright <calebcartwright@users.noreply.github.com>
…-clause-same-line, r=compiler-errors

style-guide: Format single associated type `where` clauses on the same line

In particular, lifetime-generic associated types often have a
`where Self: 'a` bound, which we can format on the same line.
…ert-label, r=apiraino

[meta] Clarify prioritization alert

Apparently, there used to exist the label <kbd>I-nominated</kbd> judging from this entry:

/~https://github.com/rust-lang/rust/blob/8847bda592d940ae1f34d87d8cacdc09a9f787fa/triagebot.toml#L393

Since it was replaced with individual team labels, I think it makes sense to update the prioritization alert. Of course, it's not super important since the members of WG-prioritization already know that. This is just cleanup.

r? apiraino or wg-prioritization
Stabilize `seek_seek_relative`

This PR stabilizes `seek_seek_relative`:

```rust
// std::io::Seek

trait Seek {
    fn seek_relative(&mut self, offset: i64) -> Result<()>;
}
```

<br>

Tracking issue: rust-lang#117374.
Implementation PR: rust-lang#116750.

FCPs already completed in the tracking issue.

Closes rust-lang#117374.

r? libs-api
…lwoerister

Don't call `env::set_var` in `rustc_driver::install_ice_hook`

Modifying an environment variable would make the function unsafe to call.
…get-spec-json-path, r=jieyouxu

Migrate rustdoc target spec json path

Part of rust-lang#121876.

r? `@jieyouxu`
@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-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. T-style Relevant to the style team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels May 13, 2024
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented May 13, 2024

📌 Commit ed2c2c0 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 13, 2024
@bors
Copy link
Contributor

bors commented May 13, 2024

⌛ Testing commit ed2c2c0 with merge ab14f94...

@bors
Copy link
Contributor

bors commented May 13, 2024

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 13, 2024
@bors bors merged commit ab14f94 into rust-lang:master May 13, 2024
7 checks passed
@rustbot rustbot added this to the 1.80.0 milestone May 13, 2024
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#119515 style-guide: Format single associated type where clauses … a53d243e9510b0cbab73cb1b4d36699467321837 (link)
#119959 [meta] Clarify prioritization alert d2b2c966f7b344f6ac499ae5a169fefb2f1ee001 (link)
#123817 Stabilize seek_seek_relative ac41987388b2f65470ed8a3de16657e1c76323e6 (link)
#125063 Don't call env::set_var in `rustc_driver::install_ice_hoo… 0816939b95e1458d60f4d73af09500ffbb2b40f1 (link)
#125071 Migrate rustdoc target spec json path 6569ce2c16dc9ddabb85ff95e3232a73d239b735 (link)

previous master: 030a12ce2b

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 (ab14f94): 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

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

Cycles

Results

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

Binary size

Results

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

Bootstrap: 677.739s -> 676.19s (-0.23%)
Artifact size: 316.16 MiB -> 315.97 MiB (-0.06%)

@matthiaskrgr matthiaskrgr deleted the rollup-xob4lof branch September 1, 2024 17:36
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-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. T-style Relevant to the style 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