Rollup of 7 pull requests #117294

matthiaskrgr · 2023-10-27T17:46:11Z

Successful merges:

Remove rustc_symbol_mangling/messages.ftl. #116834 (Remove rustc_symbol_mangling/messages.ftl.)
Properly restore snapshot when failing to recover parsing ternary #117212 (Properly restore snapshot when failing to recover parsing ternary)
Fix ICE: Restrict param constraint suggestion #117246 (Fix ICE: Restrict param constraint suggestion)
NVPTX: Allow PassMode::Direct for ptx kernels for now #117247 (NVPTX: Allow PassMode::Direct for ptx kernels for now)
Hide internal methods from documentation #117270 (Hide internal methods from documentation)
std::thread : add SAFETY comment #117281 (std::thread : add SAFETY comment)
fix miri target information for Test step #117287 (fix miri target information for Test step)

r? @ghost
@rustbot modify labels: rollup

It contains a single message that (a) doesn't contain any natural language, and (b) is only used in tests.

When encountering an associated item with a type param that could be constrained, do not look at the parent item if the type param comes from the associated item. Fix rust-lang#117209.

…ect assert Co-authored-by: Jubilee <46493976+workingjubilee@users.noreply.github.com>

Signed-off-by: onur-ozkan <work@onurozkan.dev>

Fix rust-lang#89868.

… r=davidtwco Remove `rustc_symbol_mangling/messages.ftl`. It contains a single message that (a) doesn't contain any natural language, and (b) is only used in tests. r? `@davidtwco`

…ompiler-errors Properly restore snapshot when failing to recover parsing ternary If the recovery parsed an expression, then failed to eat a `:`, it would return `false` without restoring the snapshot. Fix this by always restoring the snapshot when returning `false`. Draft for now because I'd like to try and improve this recovery further. Fixes rust-lang#117208

Fix ICE: Restrict param constraint suggestion When encountering an associated item with a type param that could be constrained, do not look at the parent item if the type param comes from the associated item. Fix rust-lang#117209, fix rust-lang#89868.

…exception, r=workingjubilee,RalfJung NVPTX: Allow PassMode::Direct for ptx kernels for now Upgrading the nvptx toolchain to the newest nightly makes it hit the assert that links to rust-lang#115666 It seems like most targets get around this by using `PassMode::Indirect`. That is impossible for the kernel as it's not a normal call, but instead the arguments are copied from CPU to GPU and the passed pointer would be invalid when it reached the GPU. I also made an experiment with `PassMode::Cast` but at least the most simple version of this broke the assembly API tests. I added fixing the pass mode in my unofficial tracking issue list (I do not have the necessary permissions to update to official one). rust-lang#38788 (comment) Since the ptx_abi is currently unstable and have been working with `PassMode::Direct` for more than a year now, the steps above is hopefully sufficient to enable it as an exception until I can prioritize to fix it. I'm currently looking at steps to enable the CI for nvptx64 again and would prefer to finish that first.

…risDenton Hide internal methods from documentation The two methods here are perma-unstable and only made public for technical reasons. There is no reason to show them in documentation. `@rustbot` label +A-docs

std::thread : add SAFETY comment I forgot to add this in rust-lang#117266.

…=RalfJung fix miri target information for Test step self-explanatory r? RalfJung

matthiaskrgr · 2023-10-27T17:46:31Z

@bors r+ rollup=never p=7

bors · 2023-10-27T17:46:33Z

📌 Commit b9015da has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2023-10-27T18:47:35Z

⌛ Testing commit b9015da with merge d32d4b3...

…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#116834 (Remove `rustc_symbol_mangling/messages.ftl`.) - rust-lang#117212 (Properly restore snapshot when failing to recover parsing ternary) - rust-lang#117246 (Fix ICE: Restrict param constraint suggestion) - rust-lang#117247 (NVPTX: Allow PassMode::Direct for ptx kernels for now) - rust-lang#117270 (Hide internal methods from documentation) - rust-lang#117281 (std::thread : add SAFETY comment) - rust-lang#117287 (fix miri target information for Test step) r? `@ghost` `@rustbot` modify labels: rollup

rust-log-analyzer · 2023-10-27T18:50:09Z

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

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


Sending build context to Docker daemon  425.5kB

Step 1/22 : FROM ubuntu:22.04
Head "https://registry-1.docker.io/v2/library/ubuntu/manifests/22.04": error parsing HTTP 429 response body: invalid character 'T' looking for beginning of value: "Too Many Requests (HAP429).\n"
DEPRECATED: The legacy builder is deprecated and will be removed in a future release.
            BuildKit is currently disabled; enable it by removing the DOCKER_BUILDKIT=0
            environment-variable.


Sending build context to Docker daemon  425.5kB

Step 1/22 : FROM ubuntu:22.04
error parsing HTTP 429 response body: invalid character 'T' looking for beginning of value: "Too Many Requests (HAP429).\n"
DEPRECATED: The legacy builder is deprecated and will be removed in a future release.
            BuildKit is currently disabled; enable it by removing the DOCKER_BUILDKIT=0
            environment-variable.


Sending build context to Docker daemon  425.5kB

Step 1/22 : FROM ubuntu:22.04
error parsing HTTP 429 response body: invalid character 'T' looking for beginning of value: "Too Many Requests (HAP429).\n"
DEPRECATED: The legacy builder is deprecated and will be removed in a future release.
            BuildKit is currently disabled; enable it by removing the DOCKER_BUILDKIT=0
            environment-variable.


Sending build context to Docker daemon  425.5kB

Step 1/22 : FROM ubuntu:22.04
error parsing HTTP 429 response body: invalid character 'T' looking for beginning of value: "Too Many Requests (HAP429).\n"
DEPRECATED: The legacy builder is deprecated and will be removed in a future release.
            BuildKit is currently disabled; enable it by removing the DOCKER_BUILDKIT=0
            environment-variable.


Sending build context to Docker daemon  425.5kB

Step 1/22 : FROM ubuntu:22.04
error parsing HTTP 429 response body: invalid character 'T' looking for beginning of value: "Too Many Requests (HAP429).\n"
##[error]Process completed with exit code 1.
Post job cleanup.

bors · 2023-10-27T18:50:36Z

💔 Test failed - checks-actions

matthiaskrgr · 2023-10-27T18:56:10Z

@bors retry

bors · 2023-10-27T21:11:55Z

⌛ Testing commit b9015da with merge 2f1bd07...

bors · 2023-10-27T23:07:18Z

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

rust-timer · 2023-10-27T23:09:16Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#116834	Remove `rustc_symbol_mangling/messages.ftl`.	`5e145b7cf0aa648756364d305d390e5a925fb2c0` (link)
#117212	Properly restore snapshot when failing to recover parsing t…	`667ac817246fd99e9a6d6e2526adf17b510d287b` (link)
#117246	Fix ICE: Restrict param constraint suggestion	`57e2e4fd21c045cb414f80f0bb8eb9cad3b34332` (link)
#117247	NVPTX: Allow PassMode::Direct for ptx kernels for now	`8eed35e951084b5145c2d724c980096666b62862` (link)
#117270	Hide internal methods from documentation	`5ac0ca71a1ed9b9f9572bd25196e1fb7ae805c0e` (link)
#117281	std::thread : add SAFETY comment	`51ca7415562f0f1c7c789288abaa7c9389fdd4e4` (link)
#117287	fix miri target information for Test step	`59ea1fc710dc5902e74a3d4048352904b055cd9f` (link)

previous master: 59bb9505bc

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-28T04:23:03Z

Finished benchmarking commit (2f1bd07): 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)	-	-	0
Regressions ❌ (secondary)	3.3%	[1.4%, 5.5%]	3
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-2.3%	[-3.9%, -0.8%]	2
All ❌✅ (primary)	-	-	0

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: 636.148s -> 635.719s (-0.07%)
Artifact size: 304.51 MiB -> 304.53 MiB (0.01%)

nnethercote and others added 18 commits October 17, 2023 16:15

Remove rustc_symbol_mangling/messages.ftl.

f4a9d29

It contains a single message that (a) doesn't contain any natural language, and (b) is only used in tests.

Properly restore snapshot when failing to recover parsing ternary

041f031

Restrict param constraint suggestion

3bbc70a

When encountering an associated item with a type param that could be constrained, do not look at the parent item if the type param comes from the associated item. Fix rust-lang#117209.

NVPTX: Allow PassMode::Direct for ptx kernels for now

84c9c4a

Documentation and error message improvements related to PassMode::Dir…

4d33876

…ect assert Co-authored-by: Jubilee <46493976+workingjubilee@users.noreply.github.com>

Recover ternary expression as error

e81a5c6

Hide internal methods from documentation

72d5f4b

Link to correct issue in PassMode::Direct ptx-kernel exception

bb45c81

std::thread: add SAFETY comment

ccb36a6

fix miri target information for Test step

b915fc8

Signed-off-by: onur-ozkan <work@onurozkan.dev>

Account for type param from other item in note_and_explain

7449478

Fix rust-lang#89868.

Rollup merge of rust-lang#116834 - nnethercote:rustc_symbol_mangling,…

df8852a

… r=davidtwco Remove `rustc_symbol_mangling/messages.ftl`. It contains a single message that (a) doesn't contain any natural language, and (b) is only used in tests. r? `@davidtwco`

Rollup merge of rust-lang#117270 - jhpratt:hide-print-internals, r=Ch…

60b071f

…risDenton Hide internal methods from documentation The two methods here are perma-unstable and only made public for technical reasons. There is no reason to show them in documentation. `@rustbot` label +A-docs

Rollup merge of rust-lang#117281 - RalfJung:thread-safety, r=thomcc

f9d62a8

std::thread : add SAFETY comment I forgot to add this in rust-lang#117266.

Rollup merge of rust-lang#117287 - onur-ozkan:fix-miri-target-info, r…

b9015da

…=RalfJung fix miri target information for Test step self-explanatory r? RalfJung

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 27, 2023

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

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 27, 2023

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

bors merged commit 2f1bd07 into rust-lang:master Oct 27, 2023
11 checks passed

rustbot added this to the 1.75.0 milestone Oct 27, 2023

bors mentioned this pull request Oct 28, 2023

Clean up compiler/rustc*/Cargo.toml #117068

Merged

github-actions bot mentioned this pull request Oct 31, 2023

Automated pull from upstream master ferrocene/ferrocene#74

Merged

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 7 pull requests #117294

Rollup of 7 pull requests #117294

matthiaskrgr commented Oct 27, 2023

matthiaskrgr commented Oct 27, 2023

bors commented Oct 27, 2023

bors commented Oct 27, 2023

rust-log-analyzer commented Oct 27, 2023

bors commented Oct 27, 2023

matthiaskrgr commented Oct 27, 2023

bors commented Oct 27, 2023

bors commented Oct 27, 2023

rust-timer commented Oct 27, 2023

rust-timer commented Oct 28, 2023

Rollup of 7 pull requests #117294

Rollup of 7 pull requests #117294

Conversation

matthiaskrgr commented Oct 27, 2023

matthiaskrgr commented Oct 27, 2023

bors commented Oct 27, 2023

bors commented Oct 27, 2023

rust-log-analyzer commented Oct 27, 2023

bors commented Oct 27, 2023

matthiaskrgr commented Oct 27, 2023

bors commented Oct 27, 2023

bors commented Oct 27, 2023

rust-timer commented Oct 27, 2023

rust-timer commented Oct 28, 2023

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size