Skip to content

Rollup of 6 pull requests - #112661

Merged
bors merged 16 commits into
rust-lang:masterfrom
matthiaskrgr:rollup-9u5i2zy
Jun 15, 2023
Merged

Rollup of 6 pull requests#112661
bors merged 16 commits into
rust-lang:masterfrom
matthiaskrgr:rollup-9u5i2zy

Conversation

@matthiaskrgr

Copy link
Copy Markdown
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

GuillaumeGomezand others added 16 commits June 5, 2023 10:48
…elix
Add casting suggestion when assigning negative 2's complement bin or hex literal to a size compatible signed integer
Fixesrust-lang#107896
The issue stated the case for `iX::MIN` variants. This PR extends the cases for other negative values (in the 2's complement).
Leveraged sign bits to detect such cases.
Example cases:
- <img width="845" alt="image" src="https://user-images.githubusercontent.com/65026286/236289682-19859f59-a9c5-48c5-b15f-78a935fbfcec.png">
- <img width="831" alt="image" src="https://user-images.githubusercontent.com/65026286/236289805-5b16488d-9138-4363-a1b6-a5c027c50aba.png">
- <img width="912" alt="image" src="https://user-images.githubusercontent.com/65026286/236290065-685a9777-034b-4def-83a8-cc4e20b1ed0c.png">
…ddle
Add chapter in rustdoc book for re-exports and add a regression test for `#[doc(hidden)]` behaviour
Fixesrust-lang#109449.
Fixesrust-lang#53417.
After the discussion in rust-lang#109697, I made a few PRs to fix a few corner cases:
* rust-lang#112178
* rust-lang#112108
* rust-lang#111997
With this I think I covered all cases. Only thing missing at this point was a chapter covering re-exports in the rustdoc book.
r? `@notriddle`
Fix suggestion for E0404 not dealing with multiple generics
Fixesrust-lang#112472.
…eGomez
rustdoc-gui: allow running on Windows
This adds few fixes to allow running `python x.py test rustdoc-gui` on Windows.
* path to npm required to be `npm.cmd` on Windows (otherwise don't work for me)
* properly parse node module version on Windows
* properly provide path to browser-ui-test runner (fixed in rust-lang#112613)
r? `@GuillaumeGomez`
Mention `env!` in `option_env!`'s docs
`env!` mentions that there is an alternative that returns an `Option<...>` instead of emitting a compile error.
Now `option_env!` also mentions that there is an alternative that emits a compile error instead of returning an `Option<...>`.
@rustbotrustbot added 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 Jun 15, 2023
@matthiaskrgr

Copy link
Copy Markdown
MemberAuthor

@bors r+ rollup=never p=6

@bors

bors commented Jun 15, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit c0a089e has been approved by matthiaskrgr

It is now in the queue for this repository.

@borsbors 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 15, 2023
@bors

bors commented Jun 15, 2023

Copy link
Copy Markdown
Collaborator

⌛ Testing commit c0a089e with merge 331249a...

@bors

bors commented Jun 15, 2023

Copy link
Copy Markdown
Collaborator

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

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Jun 15, 2023
@bors
bors merged commit 331249a into rust-lang:masterJun 15, 2023
@rustbotrustbot added this to the 1.72.0 milestone Jun 15, 2023
@rust-timer

Copy link
Copy Markdown
Collaborator

📌 Perf builds for each rolled up PR:

PR#Perf Build Sha
#11263406b62d4497749d522e6a3c07a9c4c76944a57c07
#112621b93ced1ee71c55a625e3b9a2f7708f4a18fa8566
#11256210d75a51e1a391d576b42a61a32de17dc6d7754a
#1124869b02a9acb90dcc9b6aac59816bd19c2c8ce1225c
#112304f4a8ae877bbe21c49b940f2403be67c3225fe199
#111212ab63467e63b1d2944c0126ed73e6c781e6213578

previous master: f9097f87c9

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
Copy Markdown
Collaborator

Finished benchmarking commit (331249a): 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.

meanrangecount
Regressions ❌
(primary)
1.0%[1.0%, 1.0%]1
Regressions ❌
(secondary)
--0
Improvements ✅
(primary)
-2.7%[-2.7%, -2.7%]1
Improvements ✅
(secondary)
-2.5%[-2.7%, -2.4%]2
All ❌✅ (primary)-0.8%[-2.7%, 1.0%]2

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.

meanrangecount
Regressions ❌
(primary)
3.2%[1.5%, 4.3%]7
Regressions ❌
(secondary)
--0
Improvements ✅
(primary)
--0
Improvements ✅
(secondary)
--0
All ❌✅ (primary)3.2%[1.5%, 4.3%]7

Binary size

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

Bootstrap: 648.042s -> 648.056s (0.00%)

@matthiaskrgr
matthiaskrgr deleted the rollup-9u5i2zy branch March 16, 2024 18:18
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-borsThis PR was explicitly merged by bors.rollupA PR which is a rollupS-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-bootstrapRelevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.T-libsRelevant to the library team, which will review and decide on the PR/issue.T-rustdocRelevant 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.

10 participants

@matthiaskrgr@bors@rust-timer@rustbot@GuillaumeGomez@nicklimmm@klensy@GrigorenkoPV@mj10021@jieyouxu