Rollup of 8 pull requests#110295

matthiaskrgr · 2023-04-13T19:58:40Z

Successful merges:

Fix diff option conflict in UI test #109036 (Fix diff option conflict in UI test)
Check for body owner fallibly in error reporting #110193 (Check for body owner fallibly in error reporting)
Make rust-intrinsic ABI unwindable #110233 (Make rust-intrinsic ABI unwindable)
Added diagnostic for pin! macro in addition to Box::pin if Unpin isn't implemented #110259 (Added diagnostic for pin! macro in addition to Box::pin if Unpin isn't implemented)
Automatically update the LLVM submodule for musl target (and other places) #110265 (Automatically update the LLVM submodule for musl target (and other places))
dead-code-lint: de-dup multiple unused assoc functions #110277 (dead-code-lint: de-dup multiple unused assoc functions)
Only emit alignment checks if we have a panic_impl #110283 (Only emit alignment checks if we have a panic_impl)
Implement Copy for LocationDetail #110291 (Implement Copy for LocationDetail)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Stick `#[rustc_nounwind]` to all except `const_eval_select` to undo the change for all other intrinsics.

…t implemented

with repect to other dead code lints

- remove unused (pun intentional) `continue` - improve wording with assoc items in general

…jyn514 Fix diff option conflict in UI test Trivial fix for test case `tests/run-make/rustdoc-verify-output-files`, it's failing on MacOS, the `-u` option specifies the unified context format, while the `-q` option specifies only brief output. These two options are incompatible, since the unified context format produces a more detailed output than the brief output format.

…r=WaffleLapkin Check for body owner fallibly in error reporting Sometimes the "body id" we use for an obligation cause is not actually a body owner, like when we're doing WF checking on items. Fixes rust-lang#110157

Make rust-intrinsic ABI unwindable Fix rust-lang#104451, fix rust-lang/miri#2839 r? `@RalfJung`

…, r=cjgillot Added diagnostic for pin! macro in addition to Box::pin if Unpin isn't implemented I made a PR earlier, but accidentally renamed a branch and that deleted the PR... sorry for the duplicate Currently, if an operation on `Pin<T>` is performed that requires `T` to implement `Unpin`, the diagnostic suggestion is to use `Box::pin` ("note: consider using `Box::pin`"). This PR suggests pin! as well, as that's another valid way of pinning a value, and avoids a heap allocation. Appropriate diagnostic suggestions were included to highlight the difference in semantics (local pinning for pin! vs non-local for Box::pin). Fixes rust-lang#109964

Automatically update the LLVM submodule for musl target (and other places) Fixes rust-lang#109987

…r=lcnr dead-code-lint: de-dup multiple unused assoc functions Fixes rust-lang#109600 Prior art: rust-lang#97853

…ment, r=bjorn3 Only emit alignment checks if we have a panic_impl Fixes rust-lang#109996 r? `@bjorn3` because you commented that this situation could impact you as well

… r=oli-obk Implement `Copy` for `LocationDetail` micro-nano-little-change

matthiaskrgr · 2023-04-13T19:58:52Z

@bors r+ rollup=never p=8

bors · 2023-04-13T19:58:54Z

📌 Commit 46c6301 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2023-04-13T20:34:15Z

⌛ Testing commit 46c6301 with merge a41fc00...

bors · 2023-04-13T22:54:29Z

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

rust-timer · 2023-04-13T22:56:45Z

📌 Perf builds for each rolled up PR:

PR#	Perf Build Sha
#110291	e3b290419ec909f85eb65a2ae3230421df1652d6
#110283	839fd02db42e54895246ab5d13a7a685355b8f29
#110277	18b09e3be3fa79a10055d7a90f7fccd67d0e87c0
#110265	ab9466f448faf0bdd3cbcdf167f907e747d05ba6
#110259	31612450431b1628ff0024c0fdafcb20cf3c925d
#110233	da1209c5b46c4b63d18268ea479f24ab576f0ee7
#110193	299c4ac5389ded79fca25aa663e826a0908a90a8
#109036	af76a58ccf9f5fcde34b512c7ab4d6f5bce32fb5

previous master: e4dae0dac7

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-14T14:15:10Z

Finished benchmarking commit (a41fc00): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

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
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-0.5%	[-0.6%, -0.4%]	3
All ❌✅ (primary)	-	-	0

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.3%	[0.5%, 2.4%]	3
Regressions ❌ (secondary)	2.3%	[2.3%, 2.3%]	1
Improvements ✅ (primary)	-0.1%	[-0.1%, -0.1%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.9%	[-0.1%, 2.4%]	4

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.7%	[0.4%, 0.9%]	2
Regressions ❌ (secondary)	3.7%	[2.1%, 5.8%]	5
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.7%	[0.4%, 0.9%]	2

chenyukang and others added 22 commits March 12, 2023 07:50

Fix diff option conflict in UI test

2c66c8f

Check for body owner fallibly

1178c49

Make rust-intrinsic ABI unwindable

229b0a0

Stick `#[rustc_nounwind]` to all except `const_eval_select` to undo the change for all other intrinsics.

Bless tests

5c9b371

Added diagnostic for pin! macro in addition to Box::pin if Unpin isn'…

9e0e4c3

…t implemented

automatically update the LLVM submodule

1e2f0d2

refactor: emit "unused assoc fn" in lexical order

03cf0e9

with repect to other dead code lints

Document catch_fn in r#try cannot unwind

731c6dc

dead-code-lint: de-dup multiple unused assoc fns

c41dcac

Add regression test

b07a470

impl reviewer feedback

39e23ef

- remove unused (pun intentional) `continue` - improve wording with assoc items in general

bless the single test

2bafc0f

Only emit alignment checks if we have a panic_impl

4061eb5

Implement Copy for LocationDetail

09a8791

Rollup merge of rust-lang#110233 - nbdd0121:intrinsic, r=tmiasko

e85ecbb

Make rust-intrinsic ABI unwindable Fix rust-lang#104451, fix rust-lang/miri#2839 r? `@RalfJung`

Rollup merge of rust-lang#110265 - KittyBorgX:master, r=ozkanonur

e86de74

Automatically update the LLVM submodule for musl target (and other places) Fixes rust-lang#109987

Rollup merge of rust-lang#110277 - Ezrashaw:combine-assoc-fns-dlint, …

759d4e8

…r=lcnr dead-code-lint: de-dup multiple unused assoc functions Fixes rust-lang#109600 Prior art: rust-lang#97853

Rollup merge of rust-lang#110283 - saethlin:check-panics-before-align…

c140e25

…ment, r=bjorn3 Only emit alignment checks if we have a panic_impl Fixes rust-lang#109996 r? `@bjorn3` because you commented that this situation could impact you as well

Rollup merge of rust-lang#110291 - WaffleLapkin:copy_location_detail,…

46c6301

… r=oli-obk Implement `Copy` for `LocationDetail` micro-nano-little-change

bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 13, 2023

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Apr 13, 2023

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

bors merged commit a41fc00 into rust-lang:master Apr 13, 2023

rustbot added this to the 1.70.0 milestone Apr 13, 2023

bors mentioned this pull request Apr 13, 2023

Assemble Unpin candidates specially for generators in new solver #110207

Merged

matthiaskrgr deleted the rollup-xas29a1 branch March 16, 2024 18:20

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 8 pull requests#110295