Rollup of 9 pull requests #124084

matthiaskrgr · 2024-04-17T16:01:42Z

Successful merges:

meta: notify #t-rustdoc Zulip stream on backport nominations #116957 (meta: notify #t-rustdoc Zulip stream on backport nominations)
Document overrides of clone_from() in core/std #122201 (Document overrides of clone_from() in core/std)
Use same file permissions for ar_archive_writer as the LLVM archive writer #122723 (Use same file permissions for ar_archive_writer as the LLVM archive writer)
interpret: pass MemoryKind to adjust_alloc_base_pointer #124030 (interpret: pass MemoryKind to adjust_alloc_base_pointer)
Don't ascend into parent bodies when collecting stmts for possible return suggestion #124037 (Don't ascend into parent bodies when collecting stmts for possible return suggestion)
Stabilize const_io_structs #124049 (Stabilize const_io_structs)
Add another expression to weird-exprs.rs #124062 (Add another expression to weird-exprs.rs)
Don't error on subtyping of equal types #124066 (Don't error on subtyping of equal types)
Remove libc from rust_get_test_int uses #124073 (Remove libc from rust_get_test_int uses)

r? @ghost
@rustbot modify labels: rollup

Specifically, when an override doesn't just forward to an inner type, document the behavior and that it's preferred over simply assigning a clone of source. Also, change instances where the second parameter is "other" to "source".

…eturn suggestion

also in Miri, "base tag" -> "root tag"

static libraries with ar_archive_writer Fixes rust-lang#107495

…n-backport-nominations, r=GuillaumeGomez meta: notify #t-rustdoc Zulip stream on backport nominations In July '23, it was decided to handle rustdoc-specific backport nominations in t-rustdoc meetings going forward ([Zulip announcement](https://rust-lang.zulipchat.com/#narrow/stream/266220-t-rustdoc/topic/T-rustdoc.20backports/near/374828518)). However, t-rustdoc meetings are far too infrequent for them to address nominations on time (contrary to the weekly t-compiler meetings). Hence GuillaumeGomez and I came to the conclusion that {beta,stable}-nominated rustdoc PRs should be dealt with on a case by case basis, e.g. on Zulip. This PR attempts to partially automate this process. ~~Sadly, `triagebot` is not quite as flexible has I've hoped. Blocked on `triagebot` improvements (see the `FIXME`s in this PR).~~ (Fixed in rust-lang/triagebot#1791). r? GuillaumeGomez

…lnay Document overrides of `clone_from()` in core/std As mentioned in rust-lang#96979 (comment) Specifically, when an override doesn't just forward to an inner type, document the behavior and that it's preferred over simply assigning a clone of source. Also, change instances where the second parameter is "other" to "source". I reused some of the wording over and over for similar impls, but I'm not sure that the wording is actually *good*. Would appreciate feedback about that. Also, now some of these seem to provide pretty specific guarantees about behavior (e.g. will reuse the exact same allocation iff the len is the same), but I was basing it off of the docs for [`Box::clone_from`](https://doc.rust-lang.org/1.75.0/std/boxed/struct.Box.html#method.clone_from-1) - I'm not sure if providing those strong guarantees is actually good or not.

…thercote Use same file permissions for ar_archive_writer as the LLVM archive writer This is required to switch to ar_archive_writer in the future without regressions. In addition to this PR support for reading thin archives needs to be added (rust-lang#107407) to fix all known regressions. Fixes rust-lang#107495

…, r=oli-obk interpret: pass MemoryKind to adjust_alloc_base_pointer Another puzzle piece for rust-lang/miri#3475. The 2nd commit renames base_pointer -> root_pointer; that's how Tree Borrows already calls them and I think the term is more clear than "base pointer". In particular, this distinguishes it from "base address", since a root pointer can point anywhere into an allocation, not just its base address. rust-lang#124018 has been rolled up already so I couldn't add it there any more. r? ```@oli-obk```

…r=michaelwoerister Don't ascend into parent bodies when collecting stmts for possible return suggestion Fixes rust-lang#124022

…ze, r=jhpratt Stabilize `const_io_structs` This PR stabilizes `const_io_structs`. Tracking issue: rust-lang#78812. Implementation PR: rust-lang#78811. FCPs already completed in the tracking issue. Closes rust-lang#78812. ```@rustbot``` label: +T-libs-api r? libs-api

Add another expression to weird-exprs.rs I'm almost feeling bad for this but I decided I don't. Feel free to close if you don't approve.

…mpiler-errors Don't error on subtyping of equal types fixes rust-lang#124054 🤦 fixes rust-lang#124075 fixes rust-lang#124079 r? `@compiler-errors`

…eywiser Remove libc from rust_get_test_int uses `rust_test_helpers.c` has a few unfortunate signatures which have made some of our UI tests _technically_ need the `libc` crate. This is my attempt to evict the need of `libc` for `rust_get_test_int`. I've deleted `tests/ui/abi/foreign/foreign-no-abi.rs` because the test was originally written to check that `native mod` will compile without an ABI specifier. `native mod` was removed years before 1.0 and the test hasn't checked for anything for a long time.

matthiaskrgr · 2024-04-17T16:01:53Z

@bors r+ rollup=never p=9

bors · 2024-04-17T16:01:55Z

📌 Commit abbe0d0 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2024-04-17T16:28:03Z

⌛ Testing commit abbe0d0 with merge c45dee5...

bors · 2024-04-17T18:30:02Z

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

rust-timer · 2024-04-17T18:32:34Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#116957	meta: notify #t-rustdoc Zulip stream on backport nominations	`47557220e9a58aa246b1ae485678d088fb0d8b72` (link)
#122201	Document overrides of `clone_from()` in core/std	`892d4f64da7b6b2a4436392e31153473f5580de2` (link)
#122723	Use same file permissions for ar_archive_writer as the LLVM…	`c20c5522f844be8504ab97753ad7eb2794518e2b` (link)
#124030	interpret: pass MemoryKind to adjust_alloc_base_pointer	`c0cfd7fbab34653fea0fceacc66f51daaa7ca6ba` (link)
#124037	Don't ascend into parent bodies when collecting stmts for p…	`4af6020dd16d94aa6e0c2c498aa360b64befda27` (link)
#124049	Stabilize `const_io_structs`	`ef9c72234935f5754387031891176bdd5ff43637` (link)
#124062	Add another expression to weird-exprs.rs	`72ad4de812a2ad924415881266a45f1004a29abf` (link)
#124066	Don't error on subtyping of equal types	`b4fedd1823a2821121000d82ed7fba16c57eaed1` (link)
#124073	Remove libc from rust_get_test_int uses	`5051ac66a150c01fb3ce96bb6cdeb5c1f2850ce6` (link)

previous master: 00ed4edb44

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 · 2024-04-17T19:48:12Z

Finished benchmarking commit (c45dee5): comparison URL.

Overall result: ❌ regressions - 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.3%	[0.3%, 0.3%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
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.2%	[1.2%, 1.2%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	1.2%	[1.2%, 1.2%]	1

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

Binary size

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

Bootstrap: 677.217s -> 677.444s (0.03%)
Artifact size: 316.08 MiB -> 316.09 MiB (0.00%)

coolreader18 and others added 21 commits March 8, 2024 12:27

Document overrides of clone_from()

c0e913f

Specifically, when an override doesn't just forward to an inner type, document the behavior and that it's preferred over simply assigning a clone of source. Also, change instances where the second parameter is "other" to "source".

meta: notify #t-rustdoc Zulip stream on backport nominations

8f3d7fe

Don't proceed into parent bodies when collecting stmts for possible r…

8bbaeee

…eturn suggestion

Add another expression to weird-exprs.rs

20414b8

Stabilize const_io_structs

b7f4332

Address comments

87db7c3

interpret: pass MemoryKind to adjust_alloc_base_pointer

9e239bd

interpret: rename base_pointer -> root_pointer

ae7b07f

also in Miri, "base tag" -> "root tag"

Don't error on subtyping of equal types

182698f

Add regression test for rust-lang#107495

66a73f0

Use the default file permissions when writing

297fceb

static libraries with ar_archive_writer Fixes rust-lang#107495

Remove libc from rust_get_test_int uses

6298d8f

Rollup merge of rust-lang#124037 - compiler-errors:dont-parent-body, …

72ff1a3

…r=michaelwoerister Don't ascend into parent bodies when collecting stmts for possible return suggestion Fixes rust-lang#124022

Rollup merge of rust-lang#124062 - allgoewer:fish-fight, r=oli-obk

abac22f

Add another expression to weird-exprs.rs I'm almost feeling bad for this but I decided I don't. Feel free to close if you don't approve.

Rollup merge of rust-lang#124066 - oli-obk:define_opaque_types7, r=co…

116c0f7

…mpiler-errors Don't error on subtyping of equal types fixes rust-lang#124054 🤦 fixes rust-lang#124075 fixes rust-lang#124079 r? `@compiler-errors`

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, 2024

matthiaskrgr mentioned this pull request Apr 17, 2024

Rollup of 4 pull requests #124077

Closed

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

bors merged commit c45dee5 into rust-lang:master Apr 17, 2024
13 checks passed

rustbot added this to the 1.79.0 milestone Apr 17, 2024

This was referenced Apr 17, 2024

Remove libc from MSVC targets #124050

Merged

Sync ar_archive_writer to LLVM 18.1.3 #124033

Merged

matthiaskrgr deleted the rollup-h42psbx branch September 1, 2024 17:35

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 9 pull requests #124084

Rollup of 9 pull requests #124084

matthiaskrgr commented Apr 17, 2024

matthiaskrgr commented Apr 17, 2024

bors commented Apr 17, 2024

bors commented Apr 17, 2024

bors commented Apr 17, 2024

rust-timer commented Apr 17, 2024

rust-timer commented Apr 17, 2024

Rollup of 9 pull requests #124084

Rollup of 9 pull requests #124084

Conversation

matthiaskrgr commented Apr 17, 2024

matthiaskrgr commented Apr 17, 2024

bors commented Apr 17, 2024

bors commented Apr 17, 2024

bors commented Apr 17, 2024

rust-timer commented Apr 17, 2024

rust-timer commented Apr 17, 2024

Overall result: ❌ regressions - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size