Rollup of 7 pull requests by matthiaskrgr · Pull Request #110440 · rust-lang/rust

matthiaskrgr · 2023-04-17T06:09:43Z

Successful merges:

Erase regions when confirming transmutability candidate #110038 (Erase regions when confirming transmutability candidate)
rustdoc: stop passing a title to replaceState second argument #110341 (rustdoc: stop passing a title to replaceState second argument)
Add a message for if an overflow occurs in core::intrinsics::is_nonoverlapping. #110388 (Add a message for if an overflow occurs in core::intrinsics::is_nonoverlapping.)
fix clippy::toplevel_ref_arg and ::manual_map #110404 (fix clippy::toplevel_ref_arg and ::manual_map)
Spelling librustdoc #110421 (Spelling librustdoc)
Spelling srcdoc #110423 (Spelling srcdoc)
Windows: map a few more error codes to ErrorKind #110433 (Windows: map a few more error codes to ErrorKind)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

As described on [MDN's replaceState page], this parameter is not currently used, and the empty string is "safe against future changes to the method." [MDN's replaceState page]: https://developer.mozilla.org/en-US/docs/Web/API/History/replaceState

and `unwrap` in `core::intrinsics`.

`core::intrinsics::is_nonoverlapping`.

* incompatibilities * invocation * keywords * nonexistent * shakespeare * the * toolchain * transparent Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

NotFound errors: * `ERROR_INVALID_DRIVE`: The system cannot find the drive specified * `ERROR_BAD_NETPATH`: The network path was not found * `ERROR_BAD_NET_NAME`: The network name cannot be found. InvalidFilename: * `ERROR_BAD_PATHNAME`: The specified path is invalid.

* associated * collected * correspondence * inlining * into * javascript * multiline * variadic Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

…ransmutability, r=lcnr Erase regions when confirming transmutability candidate Fixes an ICE where we call `layout_of` on a type with infer regions.

…estate, r=GuillaumeGomez rustdoc: stop passing a title to `replaceState` second argument As described on [MDN's replaceState page], this parameter is not currently used, and the empty string is "safe against future changes to the method." [MDN's replaceState page]: https://developer.mozilla.org/en-US/docs/Web/API/History/replaceState

…p, r=the8472 Add a message for if an overflow occurs in `core::intrinsics::is_nonoverlapping`.

fix clippy::toplevel_ref_arg and ::manual_map r? ``@Nilstrieb``

…iddle Spelling librustdoc This is split from rust-lang#110392 There's one change to src/tools/rustdoc-gui/tester.js which feels like a reasonable thing to piggy-back here.

Spelling srcdoc

Windows: map a few more error codes to ErrorKind NotFound errors: * `ERROR_INVALID_DRIVE`: The system cannot find the drive specified * `ERROR_BAD_NETPATH`: The network path was not found * `ERROR_BAD_NET_NAME`: The network name cannot be found. InvalidFilename: * `ERROR_BAD_PATHNAME`: The specified path is invalid. Source: [System Error Codes (0-499)](https://learn.microsoft.com/en-us/windows/win32/debug/system-error-codes--0-499-)

matthiaskrgr · 2023-04-17T06:10:00Z

@bors r+ rollup=never p=7

bors · 2023-04-17T06:10:02Z

📌 Commit 35e6389 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2023-04-17T07:25:05Z

⌛ Testing commit 35e6389 with merge bdb32bd...

bors · 2023-04-17T09:38:24Z

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

rust-timer · 2023-04-17T09:40:24Z

📌 Perf builds for each rolled up PR:

PR#	Perf Build Sha
#110433	c4a1502c7cd2a4db24dd377b5a04b45e189d320f
#110423	8f2ef988d113fc745d79a6a2ec85933c2d05c714
#110421	db5a68a8202364610913c2fe42f1e332f736bfc1
#110404	ee1614f52e0ac00d7e60e405a65a020250351945
#110388	11768a8bd337de0c981a37622b7672cb55e4833f
#110341	e27d43f3b024ac82e6cf43b1da5d0ed290c356e4
#110038	a4aeb09949ef0b69b6eda30aa1e41c1302bc8694

previous master: 53ac4f8e2f

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-04-17T10:54:47Z

Finished benchmarking commit (bdb32bd): 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.3%	[0.2%, 0.3%]	3
Regressions ❌ (secondary)	0.4%	[0.2%, 1.1%]	9
Improvements ✅ (primary)	-0.8%	[-0.9%, -0.7%]	4
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-0.3%	[-0.9%, 0.3%]	7

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

notriddleand others added 15 commits April 15, 2023 13:15

Use a saturating_mul instead of a checked_mul
d0603fd
and `unwrap` in `core::intrinsics`.

fix clippy::toplevel_ref_arg and ::manual_map
543f8bc

Add a message indicating overflow in
3dba587
`core::intrinsics::is_nonoverlapping`.

Spelling src/doc
b1da6a7
* incompatibilities * invocation * keywords * nonexistent * shakespeare * the * toolchain * transparent Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

Erase regions when confirming transmutability candidate
f6bfb4b

Spelling librustdoc
bb2f23c
* associated * collected * correspondence * inlining * into * javascript * multiline * variadic Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

Rollup merge ofrust-lang#110038- compiler-errors:infer-regions-in-t…
f5222cd
…ransmutability, r=lcnr Erase regions when confirming transmutability candidate Fixes an ICE where we call `layout_of` on a type with infer regions.

Rollup merge ofrust-lang#110388- JohnBobbo96:remove-intrinsic-unwra…
6e9a52c
…p, r=the8472 Add a message for if an overflow occurs in `core::intrinsics::is_nonoverlapping`.

Rollup merge ofrust-lang#110404- matthiaskrgr:mapmap, r=Nilstrieb
1795bf8
fix clippy::toplevel_ref_arg and ::manual_map r? ``@Nilstrieb``

Rollup merge ofrust-lang#110421- jsoref:spelling-librustdoc, r=notr…
902b419
…iddle Spelling librustdoc This is split from rust-lang#110392 There's one change to src/tools/rustdoc-gui/tester.js which feels like a reasonable thing to piggy-back here.

Rollup merge ofrust-lang#110423- jsoref:spelling-srcdoc, r=Nilstrieb
0a2c0ec
Spelling srcdoc

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 Apr 17, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 17, 2023

bors merged commit bdb32bd into rust-lang:masterApr 17, 2023

rustbot added this to the 1.71.0 milestone Apr 17, 2023

rustbot added the perf-regression Performance regression. label Apr 17, 2023

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

Navigation Menu

Uh oh!

Uh oh!

Rollup of 7 pull requests - #110440

Rollup of 7 pull requests#110440
bors merged 15 commits into
rust-lang:masterfrom
matthiaskrgr:rollup-eit19vi

matthiaskrgr commented Apr 17, 2023

Uh oh!

matthiaskrgr commented Apr 17, 2023

Uh oh!

bors commented Apr 17, 2023

Uh oh!

bors commented Apr 17, 2023

Uh oh!

bors commented Apr 17, 2023

Uh oh!

rust-timer commented Apr 17, 2023

Uh oh!

rust-timer commented Apr 17, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

Uh oh!

Uh oh!

Conversation

matthiaskrgr commented Apr 17, 2023

Uh oh!

matthiaskrgr commented Apr 17, 2023

Uh oh!

bors commented Apr 17, 2023

Uh oh!

bors commented Apr 17, 2023

Uh oh!

bors commented Apr 17, 2023

Uh oh!

rust-timer commented Apr 17, 2023

Uh oh!

rust-timer commented Apr 17, 2023

Overall result: ❌✅ regressions and improvements - ACTION NEEDED

Instruction count

Max RSS (memory usage)

Cycles

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants