Rollup of 3 pull requests #116782

matthiaskrgr · 2023-10-16T04:26:22Z

Successful merges:

Suggest adding return if the for semi which can coerce to the fn return type #115196 (Suggest adding return if the for semi which can coerce to the fn return type)
Stabilize {IpAddr, Ipv6Addr}::to_canonical #115955 (Stabilize {IpAddr, Ipv6Addr}::to_canonical)
Enable review-requested feature for rustbot #116776 (Enable review-requested feature for rustbot)

r? @ghost
@rustbot modify labels: rollup

Make `IpAddr::to_canonical` and `IpV6Addr::to_canonical` stable, as well as const stabilize `Ipv6Addr::to_ipv4_mapped`. Newly stable API: impl IpAddr { // Now stable under `ip_to_canonical` const fn to_canonical(&self) -> IpAddr; } impl Ipv6Addr { // Now stable under `ip_to_canonical` const fn to_canonical(&self) -> IpAddr; // Already stable, this makes it const stable under // `const_ipv6_to_ipv4_mapped` const fn to_ipv4_mapped(&self) -> Option<Ipv4Addr> } These stabilize a subset of the following tracking issues: - rust-lang#27709 - rust-lang#76205

…oerce to the fn return type

…ebank Suggest adding `return` if the for semi which can coerce to the fn return type Fixes rust-lang#86094 r? `@estebank`

Stabilize `{IpAddr, Ipv6Addr}::to_canonical` Make `IpAddr::to_canonical` and `IpV6Addr::to_canonical` stable (+const), as well as const stabilize `Ipv6Addr::to_ipv4_mapped`. Newly stable API: ```rust impl IpAddr { // Newly stable under `ip_to_canonical` const fn to_canonical(&self) -> IpAddr; } impl Ipv6Addr { // Newly stable under `ip_to_canonical` const fn to_canonical(&self) -> IpAddr; // Already stable, this makes it const stable under // `const_ipv6_to_ipv4_mapped` const fn to_ipv4_mapped(&self) -> Option<Ipv4Addr> } ``` These stabilize a subset of the following tracking issues: - rust-lang#27709 - rust-lang#76205 Stabilization of all methods under the `ip` gate was attempted once at rust-lang#66584 then again at rust-lang#76098. These were not successful because there are still unknowns about `is_documentation` `is_benchmarking` and similar; `to_canonical` is much more straightforward. I have looked and could not find any known issues with `to_canonical`. These were added in 2021 in rust-lang#87708 cc implementor ``@the8472`` r? libs-api ``@rustbot`` label +T-libs-api +needs-fcp

…ested, r=Mark-Simulacrum Enable `review-requested` feature for rustbot See rust-lang/triagebot#1733. r? `@Mark-Simulacrum`

matthiaskrgr · 2023-10-16T04:26:49Z

@bors r+ rollup=never p=3

bors · 2023-10-16T04:26:51Z

📌 Commit 8feb7c5 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2023-10-16T06:02:28Z

⌛ Testing commit 8feb7c5 with merge 9ace9da...

bors · 2023-10-16T07:57:45Z

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

rust-timer · 2023-10-16T07:58:40Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#115196	Suggest adding `return` if the for semi which can coerce to…	`3fc4a9582a6b09eda7eae27a3ddbcf5e2ef88206` (link)
#115955	Stabilize `{IpAddr, Ipv6Addr}::to_canonical`	`94ca4b0a4eabe8951528743c6d7a8145df338483` (link)
#116776	Enable `review-requested` feature for rustbot	`2b0acb4e242b989bd9dfa6542e1359a7e59a83e1` (link)

previous master: 99592fdfa1

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 · 2023-10-16T13:04:17Z

Finished benchmarking commit (9ace9da): 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)	1.9%	[1.3%, 3.0%]	3
Regressions ❌ (secondary)	2.3%	[2.3%, 2.3%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-2.5%	[-2.5%, -2.5%]	1
All ❌✅ (primary)	1.9%	[1.3%, 3.0%]	3

Cycles

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

Binary size

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

Bootstrap: 624.466s -> 624.376s (-0.01%)
Artifact size: 305.58 MiB -> 305.51 MiB (-0.02%)

tgross35 and others added 6 commits September 18, 2023 21:03

Suggest adding return if the type of unused semi return value can c…

25d38c4

…oerce to the fn return type

Enable review-requested feature for rustbot

61a752a

Rollup merge of rust-lang#115196 - chenyukang:yukang-fix-86094, r=est…

1de910f

…ebank Suggest adding `return` if the for semi which can coerce to the fn return type Fixes rust-lang#86094 r? `@estebank`

Rollup merge of rust-lang#116776 - WaffleLapkin:hell-yeah-review-requ…

8feb7c5

…ested, r=Mark-Simulacrum Enable `review-requested` feature for rustbot See rust-lang/triagebot#1733. r? `@Mark-Simulacrum`

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 Oct 16, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 16, 2023

bors merged commit 9ace9da into rust-lang:master Oct 16, 2023
11 checks passed

rustbot added this to the 1.75.0 milestone Oct 16, 2023

Veykril mentioned this pull request Oct 17, 2023

Pull upstream master 2023 10 17 ferrocene/ferrocene#54

Merged

matthiaskrgr deleted the rollup-t3yrgku branch March 16, 2024 18:19

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 3 pull requests #116782

Rollup of 3 pull requests #116782

matthiaskrgr commented Oct 16, 2023

matthiaskrgr commented Oct 16, 2023

bors commented Oct 16, 2023

bors commented Oct 16, 2023

bors commented Oct 16, 2023

rust-timer commented Oct 16, 2023

rust-timer commented Oct 16, 2023

Rollup of 3 pull requests #116782

Rollup of 3 pull requests #116782

Conversation

matthiaskrgr commented Oct 16, 2023

matthiaskrgr commented Oct 16, 2023

bors commented Oct 16, 2023

bors commented Oct 16, 2023

bors commented Oct 16, 2023

rust-timer commented Oct 16, 2023

rust-timer commented Oct 16, 2023

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size