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

Merged
merged 24 commits into from
Feb 29, 2024
Merged

Rollup of 10 pull requests #121790

merged 24 commits into from
Feb 29, 2024

Conversation

jhpratt
Copy link
Member

@jhpratt jhpratt commented Feb 29, 2024

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

tgross35 and others added 24 commits January 8, 2024 15:39
Add some crosslinking among `std::env` pages. Also add aliases to help anyone
searching for `PATH`.
Co-authored-by: Benjamin Peter <[email protected]>
Closes rust-lang#118009

This commit adds unwind safety to Condvar. Previously, only select
platforms implemented unwind safety through auto traits. Known by this
committer: Linux was unwind safe, but Mac and Windows are not before
this change.
This commit:
- Moves the ICE file create/open outside the loop. (Redoing it on every
  loop iteration works, but is really weird.)
- Moves the explanatory note emission above the loop, which removes the
  need for the `enumerate` call.
- Introduces a `decorate` local.
Line 190 contains unpaired parentheses.
Co-authored-by: Ralf Jung <[email protected]>
…nieu

Increase visibility of `join_path` and `split_paths`

Add some crosslinking among `std::env` pages to make it easier to discover `join_paths` and `split_paths`. Also add aliases to help anyone searching for `PATH`.
Have `String` use `SliceIndex` impls from `str`

This PR simplifies the implementation of `Index` and `IndexMut` on `String`, and in the process enables indexing `String` by any user types that implement `SliceIndex<str>`.

Similar to rust-lang#47832

r? libs

Not sure if this warrants a crater run.
… r=oli-obk

Two diagnostic things

Two minor improvements to diagnostics-related things.

r? ``@RalfJung``
…_20240228, r=lcnr

Changing some attributes to only_local.

Modified according to rust-lang/compiler-team#505.

r?  ``@lcnr``
…t-deeply-norm, r=lcnr

Deeply normalize obligations in `refining_impl_trait`

We somewhat awkwardly use semantic comparison when checking the `refining_impl_trait` lint. This relies on us being able to normalize bounds eagerly to avoid cases where an unnormalized alias is not considered equal to a normalized alias. Since `normalize` in the new solver is a noop, let's use `deeply_normalize` instead.

r? lcnr

cc ``@tmandry,`` this should fix your bug lol
…manieu

Restore the standard library review rotation to its former glory

This adds 7 reviewers to the standard library review rotation, bringing the total back up to 10 people. Specifically:

* On the main rotation: ``@cuviper`` ``@Mark-Simulacrum`` ``@m-ou-se`` ``@Amanieu`` ``@Nilstrieb`` ``@workingjubilee`` ``@joboet`` ``@jhpratt``
* For `core` only: ``@scottmcm``
* For `std` only: ``@ChrisDenton``

For everyone pinged here, please confirm that you are happy to be added to the review rotation.
Implement unwind safety for Condvar on all platforms

Closes rust-lang#118009

This commit adds unwind safety consistency to Condvar. Previously, only select platforms implemented unwind safety through auto traits. Known by this committer: On Linux, `Condvar` implemented `UnwindSafe` but on Mac and Windows, it did not. This change changes the implementation from auto to explicit.

In rust-lang#118009, it was suggested that the platform differences were a bug and that a simple PR could address this. In trying to determine the best information to put in the `#[stable]` attribute, it [was suggested](rust-lang#121690 (comment)) I copy the stability information from the previous unwind safety implementations.
Fix typo in `rustc_passes/messages.ftl`

Line 190 contains unpaired parentheses:

```
passes_doc_cfg_hide_takes_list =
    `#[doc(cfg_hide(...)]` takes a list of attributes
```

The `#[doc(cfg_hide(...)]` contains unpaired parentheses. This PR changes it to `#[doc(cfg_hide(...))]`, which made the parentheses paired.
Document potential memory leak in unbounded channel

Follow up on rust-lang#121646.
@jhpratt
Copy link
Member Author

jhpratt commented Feb 29, 2024

@bors r+ rollup=never p=10

@rustbot rustbot added A-meta Area: Issues & PRs about the rust-lang/rust repository itself 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-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. labels Feb 29, 2024
@rustbot rustbot added the rollup A PR which is a rollup label Feb 29, 2024
@bors
Copy link
Contributor

bors commented Feb 29, 2024

📌 Commit 698cec8 has been approved by jhpratt

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 Feb 29, 2024
@bors
Copy link
Contributor

bors commented Feb 29, 2024

⌛ Testing commit 698cec8 with merge 71a7b66...

@bors
Copy link
Contributor

bors commented Feb 29, 2024

☀️ Test successful - checks-actions
Approved by: jhpratt
Pushing 71a7b66 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 29, 2024
@bors bors merged commit 71a7b66 into rust-lang:master Feb 29, 2024
12 checks passed
@rustbot rustbot added this to the 1.78.0 milestone Feb 29, 2024
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#119748 Increase visibility of join_path and split_paths d9cead8322f88cec40eba44d70bee43ff92c3568 (link)
#120291 Have String use SliceIndex impls from str bcc69c9ff8b735b8a40b0e1a81ab1dc46def4420 (link)
#121723 Two diagnostic things 35b3ef9cabe2bf44cb86c2f791ee045bfe91956a (link)
#121740 Changing some attributes to only_local. 5e3b66d71bc9ac741761115cc223b28c7f182b02 (link)
#121745 Deeply normalize obligations in refining_impl_trait a2f01faa00d6e4cfd8b4f0b54afe3ecdfb90190e (link)
#121748 Restore the standard library review rotation to its former … d009b50d480c4ece709a479822d3d7e1a245abba (link)
#121768 Implement unwind safety for Condvar on all platforms c4904fef4b23c7d128551ad5faf5d874d38b15ac (link)
#121777 Fix typo in rustc_passes/messages.ftl 1f65210c14a4435c405705db4e3d353a146464a6 (link)
#121778 Document potential memory leak in unbounded channel fe221592604963850d045b7a64d0e6487fc00d21 (link)
#121779 Remove unused diagnostic struct 092558ca70fad9d1a78f18a100b037ab46e7d5df (link)

previous master: d3d145ea1c

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

Overall result: ❌✅ regressions and improvements - ACTION NEEDED

Next Steps: If you can justify the regressions found in this perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please open an issue or create a new PR that fixes the regressions, add a comment linking to the newly created issue or PR, and then add the perf-regression-triaged label to this PR.

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

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
0.6% [0.6%, 0.6%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-0.4% [-0.6%, -0.3%] 2
Improvements ✅
(secondary)
-1.9% [-2.4%, -1.5%] 2
All ❌✅ (primary) -0.1% [-0.6%, 0.6%] 3

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)
6.9% [2.6%, 14.3%] 3
Regressions ❌
(secondary)
4.9% [3.7%, 6.0%] 2
Improvements ✅
(primary)
-4.8% [-5.4%, -4.3%] 2
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 2.2% [-5.4%, 14.3%] 5

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.1% [0.0%, 0.2%] 6
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-0.1% [-0.7%, -0.0%] 30
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -0.1% [-0.7%, 0.2%] 36

Bootstrap: 650.923s -> 650.304s (-0.10%)
Artifact size: 311.19 MiB -> 311.18 MiB (-0.00%)

@rustbot rustbot added the perf-regression Performance regression. label Feb 29, 2024
@jhpratt jhpratt deleted the rollup-yocg203 branch February 29, 2024 23:12
@jhpratt
Copy link
Member Author

jhpratt commented Feb 29, 2024

Results appear to be random noise.

@rustbot label pref-regression-triaged

@Mark-Simulacrum
Copy link
Member

I disagree, the Cargo change looks to be both above any noise floor and does not show signs of reverting. However, it's not significant enough (given limit to just Cargo) to investigate further.

@Mark-Simulacrum Mark-Simulacrum added the perf-regression-triaged The performance regression has been triaged. label Mar 5, 2024
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 merged-by-bors This PR was explicitly merged by bors. perf-regression Performance regression. perf-regression-triaged The performance regression has been triaged. 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-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.