Skip to content

Rollup of 6 pull requests #128360

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom
Merged
merged 18 commits into from
Jul 30, 2024
Merged

Rollup of 6 pull requests #128360

merged 18 commits into from
Jul 30, 2024

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

mu001999 and others added 18 commits July 26, 2024 21:56
@mu001999
Not lint pub structs without pub constructors if containing fields of…
adf0dff 
… unit, never type, PhantomData and positional ZST
@onur-ozkan
simplify the use of CiEnv
06d64ea 
Signed-off-by: onur-ozkan <work@onurozkan.dev>
@notriddle
rustdoc: word wrap CamelCase in the item list table
f3661dc 
This is an alternative to ee6459d.
That is, it fixes the issue that affects the very long type names
in https://docs.rs/async-stripe/0.31.0/stripe/index.html#structs.

This is, necessarily, a pile of nasty heuristics.
We need to balance a few issues:

- Sometimes, there's no real word break.
  For example, `BTreeMap` should be `BTree<wbr>Map`,
  not `B<wbr>Tree<wbr>Map`.

- Sometimes, there's a legit word break,
  but the name is tiny and the HTML overhead isn't worth it.
  For example, if we're typesetting `TyCtx`,
  writing `Ty<wbr>Ctx` would have an HTML overhead of 50%.
  Line breaking inside it makes no sense.
@notriddle
Fix tidy call in runtest with custom HTML element
583bf1e
@notriddle
rustdoc: use <wbr>-tolerant function to check text contents
0d0e18e
@notriddle
rustdoc: avoid redundant HTML when there's already line breaks
9186001
@compiler-errors
Stop using MoveDataParamEnv for places that don't need a param-env
f990239
@GKFX
Stabilize offset_of_nested
23f46e5
@jieyouxu
triagebot: make sure Nora is called Nora
f4fa80f
@notriddle
rustdoc: use <wbr> in sidebar headers
1d339b0 
This also improves sidebar layout, so instead of

    BTreeM
    ap

you get this

    BTree
    Map
@notriddle
rustdoc: properly handle path wrapping
3bf8bcf
@notriddle
rustdoc: move the wbr after the underscore, instead of before
ac303df
@matthiaskrgr
Rollup merge of rust-lang#126247 - notriddle:notriddle/word-wrap-item…
9aedec9 
…-table, r=GuillaumeGomez

rustdoc: word wrap CamelCase in the item list table and sidebar

This is an alternative to rust-lang#126209. That is, it fixes the issue that affects the very long type names in https://docs.rs/async-stripe/0.31.0/stripe/index.html#structs.

This is, necessarily, a pile of nasty heuristics. We need to balance a few issues:

- Sometimes, there's no real word break. For example, `BTreeMap` should be `BTree<wbr>Map`, not `B<wbr>Tree<wbr>Map`.

- Sometimes, there's a legit word break, but the name is tiny and the HTML overhead isn't worth it. For example, if we're typesetting `TyCtx`, writing `Ty<wbr>Ctx` would have an HTML overhead of 50%. Line breaking inside it makes no sense.

# Screenshots

| Before | After |
| ------ | ----- |
| ![image](https://github.com/rust-lang/rust/assets/1593513/d51201fd-46c0-4f48-aee6-a477eadba288) | ![image](https://github.com/rust-lang/rust/assets/1593513/d8e77582-adcf-4966-bbfd-19dfdad7336a)
@matthiaskrgr
Rollup merge of rust-lang#128104 - mu001999-contrib:fix/128053, r=pet…
91b18a0 
…rochenkov

Not lint pub structs without pub constructors intentionally

Fixes rust-lang#128053
@matthiaskrgr
Rollup merge of rust-lang#128153 - compiler-errors:mdpe, r=cjgillot
b02cf4c 
Stop using `MoveDataParamEnv` for places that don't need a param-env

I think not threading through a `ParamEnv` makes it clearer that these functions don't do anything particularly "type systems"-y.

r? cjgillot
@matthiaskrgr
Rollup merge of rust-lang#128284 - GKFX:stabilize-offset-of-nested, r…
a73a025 
…=dtolnay,jieyouxu

Stabilize offset_of_nested

Tracking issue rust-lang#120140. Closes rust-lang#120140.

As the FCP is now nearing its end I have opened a stabilization PR. I have done this separately to the offset_of_enum feature, since that FCP has not started.

`@rustbot` label  F-offset_of_nested T-lang T-libs-api
@matthiaskrgr
Rollup merge of rust-lang#128342 - onur-ozkan:ci-env-usage, r=Kobzol
4d78d11 
simplify the use of `CiEnv`

self-explanatory
@matthiaskrgr
Rollup merge of rust-lang#128355 - jieyouxu:rename-nora, r=aDotInTheVoid
c261620 
triagebot: make sure Nora is called Nora

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

@bors r+ rollup=never p=6

@bors
Copy link
Collaborator

bors commented Jul 29, 2024

📌 Commit c261620 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 Jul 29, 2024
@bors
Copy link
Collaborator

bors commented Jul 29, 2024

⌛ Testing commit c261620 with merge 368e2fd...

@bors
Copy link
Collaborator

bors commented Jul 30, 2024

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

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

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#126247 rustdoc: word wrap CamelCase in the item list table and sid… b3a2363700bce3cb166f03320b46ccd473a94af4 (link)
#128104 Not lint pub structs without pub constructors intentionally dc4683937e44793786466b971f4c40713ffd5f59 (link)
#128153 Stop using MoveDataParamEnv for places that don't need a … 2979c42b2a1fa56941445da8d70a6b6297be5270 (link)
#128284 Stabilize offset_of_nested 3566948df53d5f083177d0d950cc7bb7a061f826 (link)
#128342 simplify the use of CiEnv a32356aab177f128a610c42d6e2d27c8bd653ba0 (link)
#128355 triagebot: make sure Nora is called Nora b92cbf61ba34527950bbd1863cbe7c939ab1ae3d (link)

previous master: 612a33f20b

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

This was referenced Jul 30, 2024
Merged
Merged
Closed
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (368e2fd): 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.4%, 0.7%] 4
Regressions ❌
(secondary)		 4.4% [0.3%, 12.0%] 10
Improvements ✅
(primary)		 -0.3% [-0.3%, -0.3%] 4
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) 0.1% [-0.3%, 0.7%] 8

Max RSS (memory usage)

Results (primary 0.4%, secondary 7.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)		 3.7% [3.7%, 3.7%] 1
Regressions ❌
(secondary)		 7.8% [7.8%, 7.8%] 1
Improvements ✅
(primary)		 -0.7% [-0.8%, -0.5%] 3
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) 0.4% [-0.8%, 3.7%] 4

Cycles

Results (secondary 6.7%)

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

Binary size

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

Bootstrap: 769.793s -> 770.094s (0.04%)
Artifact size: 331.78 MiB -> 331.91 MiB (0.04%)

@rustbot rustbot added the perf-regression Performance regression. label Jul 30, 2024
@Kobzol
Copy link
Contributor

Kobzol commented Jul 30, 2024

Trying #128104 and #128153 in the corresponding PRs.

@pnkfelix
Copy link
Member

Visiting for weekly rustc-perf triage

  • primary regressions are to doc-full for html5ever, stm32f4, libc, and typenum
  • those are presumably due to PR #126247; pnkfelix thinks the above not worth further investigation
  • however, @jakub Beránek has pointed out that the secondary regressions are significant, and has identified the root cause as PR #128104
  • we are in any case planning to revert the changes to dead code analysis (see PR #128404) which should address those regressions.
  • marked as triaged.

@rustbot label: +perf-regression-triaged

@rustbot rustbot added the perf-regression-triaged The performance regression has been triaged. label Jul 31, 2024
@matthiaskrgr matthiaskrgr deleted the rollup-wwy5mkj branch September 1, 2024 17:36
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers
No reviews
Assignees
No one assigned
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. 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-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-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.82.0
Development

Successfully merging this pull request may close these issues.