Rollup of 10 pull requests #123065

workingjubilee · 2024-03-25T21:35:39Z

Successful merges:

Fix a typo in the alloc::string::String docs #122707 (Fix a typo in the alloc::string::String docs)
extend comments for reachability set computation #122769 (extend comments for reachability set computation)
fix(bootstrap/dist): use versioned dirs when vendoring #122892 (fix(bootstrap/dist): use versioned dirs when vendoring)
Update stdarch submodule #122896 (Update stdarch submodule)
In pretty_print_type(), print async fn futures' paths instead of spans. #122923 (In pretty_print_type(), print async fn futures' paths instead of spans.)
Add regression tests for #101903 #122950 (Add regression tests for TAIT fails where RPIT works #101903)
Update books #123039 (Update books)
Import the 2021 prelude in the core crate #123042 (Import the 2021 prelude in the core crate)
Instance is Copy #123044 (Instance is Copy)
did I mention that tests are super cool? #123051 (did I mention that tests are super cool? )

r? @ghost
@rustbot modify labels: rollup

Currently, if you attempt to run ui tests in a vendored build, you will see this failure ``` ---- [ui] tests/ui/issues/issue-21763.rs stdout ---- diff of stderr: 8 = note: required because it appears within the type `(Rc<()>, Rc<()>)` 9 = note: required for `hashbrown::raw::RawTable<(Rc<()>, Rc<()>)>` to implement `Send` 10 note: required because it appears within the type `hashbrown::map::HashMap<Rc<()>, Rc<()>, RandomState>` - --> $HASHBROWN_SRC_LOCATION + --> /rust/deps/hashbrown/src/map.rs:190:12 12 note: required because it appears within the type `HashMap<Rc<()>, Rc<()>>` 13 --> $SRC_DIR/std/src/collections/hash/map.rs:LL:COL 14 note: required by a bound in `foo` ``` This happend because the code that attempts to remap `HASHBROWN_SRC_LOCATION` expects it to be under `hashbrown-$version`, which is the case in a normal cargo registry, but not when vendor, where by default crates may not have the version in their directory name. This change passes `--versioned-dirs` to `cargo vendor` to enforce that every crate includes the version in the subdir name, which fixes the ui test and brings `--enable-vendor` builds closer to normal ones.

…spans. This makes `-Zprint-type-sizes`'s output easier to read, because the name of an `async fn` is more immediately recognizable than its span. I also deleted the comment "FIXME(eddyb) should use `def_span`." because it appears to have already been fixed by commit 67727aa.

also extend the const fn reachability test

Fixes rust-lang#81974

…ion(..)` but now is not Fixes rust-lang#84727

Fixes rust-lang#92979

…orkingjubilee Fix a typo in the alloc::string::String docs

extend comments for reachability set computation I hope this is right. :) Please review carefully. r? ``@tmiasko`` Cc ``@oli-obk`` ``@saethlin``

…nur-ozkan fix(bootstrap/dist): use versioned dirs when vendoring Currently, if you attempt to run ui tests in a vendored build, you will see this failure ``` ---- [ui] tests/ui/issues/issue-21763.rs stdout ---- diff of stderr: 8 = note: required because it appears within the type `(Rc<()>, Rc<()>)` 9 = note: required for `hashbrown::raw::RawTable<(Rc<()>, Rc<()>)>` to implement `Send` 10 note: required because it appears within the type `hashbrown::map::HashMap<Rc<()>, Rc<()>, RandomState>` - --> $HASHBROWN_SRC_LOCATION + --> /rust/deps/hashbrown/src/map.rs:190:12 12 note: required because it appears within the type `HashMap<Rc<()>, Rc<()>>` 13 --> $SRC_DIR/std/src/collections/hash/map.rs:LL:COL 14 note: required by a bound in `foo` ``` This happens because the code that attempts to remap `HASHBROWN_SRC_LOCATION` expects it to be under `hashbrown-$version`, which is the case in a normal cargo registry, but not when vendoring, where by default crates may not have the version in their directory name. This change passes `--versioned-dirs` to `cargo vendor` to enforce that every crate includes the version in the subdir name, which fixes the ui test and brings `--enable-vendor` builds closer to normal ones.

Update stdarch submodule r? ```@Amanieu```

…-errors In `pretty_print_type()`, print `async fn` futures' paths instead of spans. This makes `-Zprint-type-sizes`'s output easier to read, because the name of an `async fn` is more immediately recognizable than its span. This change will also synergize with my other `-Zprint-type-sizes` PR rust-lang#122922 which prints the type of child futures being awaited. I also deleted the comment "FIXME(eddyb) should use `def_span`." because it appears to have already been fixed by commit 67727aa.

…ler-errors Add regression tests for rust-lang#101903 Closes rust-lang#101903 See https://doc.rust-lang.org/1.77.0/nightly-rustc/rustc_lint/opaque_hidden_inferred_bound/static.OPAQUE_HIDDEN_INFERRED_BOUND.html#example

Update books ## rust-lang/edition-guide 1 commits in e1eead1181a691e56299294d5f1d62fe7a26d317..98b33e9a441457b0a491fe1be90e7de64eafc3e5 2024-03-23 14:17:26 UTC to 2024-03-23 14:17:26 UTC - remove indication that C string literals don't exist yet (rust-lang/edition-guide#295) ## rust-lang/reference 4 commits in 5afb503a4c1ea3c84370f8f4c08a1cddd1cdf6ad..984b36eca4b9293df04d5ba4eb5c4f77db0f51dc 2024-03-25 14:05:19 UTC to 2024-03-19 20:01:14 UTC - Fix typo of shebang (rust-lang/reference#1486) - Document importing `main` (rust-lang/reference#1461) - add grammar for `associated_type_bounds` in reference (rust-lang/reference#1481) - Literal expressions: fix mistake in the definition of unicode escapes (rust-lang/reference#1483) ## rust-lang/rust-by-example 1 commits in e093099709456e6fd74fecd2505fdf49a2471c10..7601e0c5ad29d5bd3b518700ea63fddfff5915a7 2024-03-17 21:37:25 UTC to 2024-03-17 21:37:25 UTC - Update enum_use.md to use a more neutral theme (rust-lang/rust-by-example#1828) ## rust-lang/rustc-dev-guide 12 commits in 8a5d647..ffa246b 2024-03-23 07:44:42 UTC to 2024-03-11 18:17:28 UTC - [MCP 723] Rename AstConv to HIR ty lowering (rust-lang/rustc-dev-guide#1916) - add chapter to summary (rust-lang/rustc-dev-guide#1947) - document difference between solvers + new solver normalization (rust-lang/rustc-dev-guide#1945) - Fix broken link in chapter '1. How to build and run the compiler' (rust-lang/rustc-dev-guide#1946) - typo (rust-lang/rustc-dev-guide#1944) - Reflect rustc_codegen_cranelift move (rust-lang/rustc-dev-guide#1941) - Update rustdoc-internals.md (rust-lang/rustc-dev-guide#1911) - Update test-implementation.md (rust-lang/rustc-dev-guide#1937) - Extract Bootstrap into its own section (rust-lang/rustc-dev-guide#1939) - typos (rust-lang/rustc-dev-guide#1938) - More updates for recent diagnostics changes. (rust-lang/rustc-dev-guide#1936) - Update bibliography.md (rust-lang/rustc-dev-guide#1912)

Import the 2021 prelude in the core crate The `core` crate currently imports the v1 prelude https://github.com/rust-lang/rust/blob/b3df0d7e5ef5f7dbeeca3fb289c65680ad013f87/library/core/src/lib.rs#L285-L287 This recently caused an issue when updating the `portable-simd` subtree since it was using a trait that was added to the 2021 prelude: rust-lang#122905 (comment) To make it easier to have a consistent build environment for subtrees and submodules that get included in `core`, we will now import the 2021 prelude into `core`. Fixes rust-lang#122912 r? `@Nilstrieb`

`Instance` is `Copy` No reason to take it by value; it was confusing ``@rcvalle`` to see it being mutated when it's also being passed by ref in some places.

…bilee did I mention that tests are super cool? Fixes rust-lang#81974 Fixes rust-lang#84727 Fixes rust-lang#92979

workingjubilee · 2024-03-25T21:35:47Z

@bors r+ rollup=never p=10

bors · 2024-03-25T21:35:49Z

📌 Commit 56e8f67 has been approved by workingjubilee

It is now in the queue for this repository.

bors · 2024-03-25T23:22:18Z

⌛ Testing commit 56e8f67 with merge 0597d65...

…kingjubilee Rollup of 10 pull requests Successful merges: - rust-lang#122707 (Fix a typo in the alloc::string::String docs) - rust-lang#122769 (extend comments for reachability set computation) - rust-lang#122892 (fix(bootstrap/dist): use versioned dirs when vendoring) - rust-lang#122896 (Update stdarch submodule) - rust-lang#122923 (In `pretty_print_type()`, print `async fn` futures' paths instead of spans.) - rust-lang#122950 (Add regression tests for rust-lang#101903) - rust-lang#123039 (Update books) - rust-lang#123042 (Import the 2021 prelude in the core crate) - rust-lang#123044 (`Instance` is `Copy`) - rust-lang#123051 (did I mention that tests are super cool? ) r? `@ghost` `@rustbot` modify labels: rollup

rust-log-analyzer · 2024-03-26T00:02:24Z

The job aarch64-gnu failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

[RUSTC-TIMING] rustc_mir_transform test:true 14.444
[RUSTC-TIMING] rustc_borrowck test:true 15.044
[RUSTC-TIMING] rustc_hir_typeck test:true 18.228
[RUSTC-TIMING] rustc_interface test:true 15.271
##[error]The runner has received a shutdown signal. This can happen when the runner service is stopped, or a manually started runner is canceled.

bors · 2024-03-26T00:02:57Z

💔 Test failed - checks-actions

workingjubilee · 2024-03-26T00:49:02Z

@bors retry

workingjubilee · 2024-03-26T00:49:23Z

Assuming spurious.

bors · 2024-03-26T02:07:53Z

⌛ Testing commit 56e8f67 with merge 8b9e47c...

bors · 2024-03-26T04:31:35Z

☀️ Test successful - checks-actions
Approved by: workingjubilee
Pushing 8b9e47c to master...

rust-timer · 2024-03-26T04:34:21Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#122707	Fix a typo in the alloc::string::String docs	`42e003c0bfdb4f33138bb1c0ead9368b7ec36e8d` (link)
#122769	extend comments for reachability set computation	`ea723d6e797e27b04beaff4249999e1cbe27d183` (link)
#122892	fix(bootstrap/dist): use versioned dirs when vendoring	`a01362102a65966a08a339f62b313812603c3b50` (link)
#122896	Update stdarch submodule	`9c1573a7e6dc25eaf76a8b29b89a4943a5cdf6c5` (link)
#122923	In `pretty_print_type()`, print `async fn` futures' paths i…	`c0930c66a4753898f50541c58c8b922c900c95b1` (link)
#122950	Add regression tests for #101903	`7c69b0e20dca5d2d4e3450d99ef4841f2c818f78` (link)
#123039	Update books	`3173ac09ee7dd79dab04786f30ff6733d17adbbd` (link)
#123042	Import the 2021 prelude in the core crate	`a88b1727223d1fc87c2415b75a9762975a7d34e4` (link)
#123044	`Instance` is `Copy`	`33262ed0747ca64f10e5e470a465b7fa53b14c08` (link)
#123051	did I mention that tests are super cool?	`09d4ae5d7691747c8dd233b4fd86150068b4c20f` (link)

previous master: c98ea0d808

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-03-26T05:48:52Z

Finished benchmarking commit (8b9e47c): 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)	-1.0%	[-1.0%, -1.0%]	1
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.4%	[1.2%, 1.7%]	4
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-1.3%	[-3.1%, -0.5%]	4
Improvements ✅ (secondary)	-2.1%	[-2.1%, -2.1%]	1
All ❌✅ (primary)	0.1%	[-3.1%, 1.7%]	8

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.5%	[0.5%, 0.5%]	2
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-0.7%	[-0.8%, -0.4%]	5
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-0.3%	[-0.8%, 0.5%]	7

Binary size

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

Bootstrap: 675.795s -> 671.335s (-0.66%)
Artifact size: 315.67 MiB -> 315.66 MiB (-0.00%)

rust-log-analyzer · 2024-03-26T08:09:13Z

A job failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

  PR_MESSAGE: Automation to keep dependencies in `Cargo.lock` current.
following is the output from `cargo update`:
  COMMIT_MESSAGE: cargo update 
##[endgroup]
Starting download for Cargo-lock
##[error]Unable to find any artifacts for the associated workflow

reedwoodruff and others added 23 commits March 18, 2024 11:39

Fix a typo in the alloc::string::String docs

7b3ef13

Update stdarch submodule

9685161

Add regression tests for rust-lang#101903

c31b217

Amended wording

58e2ad3

Update books

95f268e

Instance is Copy

99fbc6f

extend doc comment for reachability set computation

d94f657

also extend the const fn reachability test

add test for Compiler panic using fn_traits rust-lang#81974

5f95fc1

Fixes rust-lang#81974

add test for ICE Where clause Binder(..) was applicable to `Obligat…

6fe5555

…ion(..)` but now is not Fixes rust-lang#84727

add test for ICE: failed to get layout for [type error] rust-lang#92979

a3c2d75

Fixes rust-lang#92979

Import the 2021 prelude in the core crate

d261647

Rollup merge of rust-lang#122707 - reedwoodruff:string_docs_typo, r=w…

c35e971

…orkingjubilee Fix a typo in the alloc::string::String docs

Rollup merge of rust-lang#122769 - RalfJung:reachable, r=tmiasko

2f8c9bd

extend comments for reachability set computation I hope this is right. :) Please review carefully. r? ``@tmiasko`` Cc ``@oli-obk`` ``@saethlin``

Rollup merge of rust-lang#122896 - dpaoliello:stdarch, r=Amanieu

cf9acea

Update stdarch submodule r? ```@Amanieu```

Rollup merge of rust-lang#123044 - compiler-errors:instance, r=oli-obk

77de550

`Instance` is `Copy` No reason to take it by value; it was confusing ``@rcvalle`` to see it being mutated when it's also being passed by ref in some places.

Rollup merge of rust-lang#123051 - matthiaskrgr:casetest, r=workingju…

56e8f67

…bilee did I mention that tests are super cool? Fixes rust-lang#81974 Fixes rust-lang#84727 Fixes rust-lang#92979

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

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 26, 2024

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

bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 26, 2024

bors merged commit 8b9e47c into rust-lang:master Mar 26, 2024
12 checks passed

rustbot added this to the 1.79.0 milestone Mar 26, 2024

This was referenced Mar 26, 2024

Relocate coroutine upvars into Unresumed state #120168

Closed

Stabilize Wasm relaxed SIMD #117468

Merged

Added traits implemented by FnPtr to fn docs with example function #112106

Open

workingjubilee deleted the rollup-bve45ex branch March 26, 2024 05:13

This was referenced Mar 26, 2024

panic_str only exists for the migration to 2021 panic macros #123050

Merged

CFI: Support function pointers for trait methods #123052

Merged

CFI: Fix methods as function pointer cast #123071

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 10 pull requests #123065

Rollup of 10 pull requests #123065

workingjubilee commented Mar 25, 2024

workingjubilee commented Mar 25, 2024

bors commented Mar 25, 2024

bors commented Mar 25, 2024

rust-log-analyzer commented Mar 26, 2024

bors commented Mar 26, 2024

workingjubilee commented Mar 26, 2024

workingjubilee commented Mar 26, 2024

bors commented Mar 26, 2024

bors commented Mar 26, 2024

rust-timer commented Mar 26, 2024

rust-timer commented Mar 26, 2024

rust-log-analyzer commented Mar 26, 2024

Rollup of 10 pull requests #123065

Rollup of 10 pull requests #123065

Conversation

workingjubilee commented Mar 25, 2024

workingjubilee commented Mar 25, 2024

bors commented Mar 25, 2024

bors commented Mar 25, 2024

rust-log-analyzer commented Mar 26, 2024

bors commented Mar 26, 2024

workingjubilee commented Mar 26, 2024

workingjubilee commented Mar 26, 2024

bors commented Mar 26, 2024

bors commented Mar 26, 2024

rust-timer commented Mar 26, 2024

rust-timer commented Mar 26, 2024

Overall result: ✅ improvements - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

rust-log-analyzer commented Mar 26, 2024